From 33b905883819038ad67476fe14b7b48212a73f93 Mon Sep 17 00:00:00 2001
From: Clemens Wasser <clemens.wasser@gmail.com>
Date: Wed, 10 Jun 2020 09:27:25 +0200
Subject: Most of the checkOnSafe options now default to the cargo equivalent.

---
 crates/rust-analyzer/src/config.rs |  6 +++++-
 editors/code/package.json          | 11 +++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 320414ecf..617612dc3 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -241,7 +241,11 @@ impl Config {
                         set(value, "/checkOnSave/extraArgs", extra_args);
                         set(value, "/checkOnSave/command", command);
                         set(value, "/checkOnSave/allTargets", all_targets);
-                        set(value, "/checkOnSave/allFeatures", all_features);
+                        if let Some(new_all_features) = get(value, "/checkOnSave/allFeatures") {
+                            *all_features = new_all_features;
+                        } else {
+                            *all_features = self.cargo.all_features;
+                        }
                         set(value, "/checkOnSave/features", features);
                         if features.is_empty() && !self.cargo.features.is_empty() {
                             *features = self.cargo.features.clone();
diff --git a/editors/code/package.json b/editors/code/package.json
index 6389499e9..647c83685 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -318,9 +318,12 @@
                     "markdownDescription": "Check all targets and tests (will be passed as `--all-targets`)"
                 },
                 "rust-analyzer.checkOnSave.allFeatures": {
-                    "type": "boolean",
-                    "default": false,
-                    "markdownDescription": "Check with all features (will be passed as `--all-features`)"
+                    "type": [
+                        "null",
+                        "boolean"
+                    ],
+                    "default": null,
+                    "markdownDescription": "Check with all features (will be passed as `--all-features`). Defaults to `rust-analyzer.cargo.allFeatures`."
                 },
                 "rust-analyzer.checkOnSave.features": {
                     "type": "array",
@@ -328,7 +331,7 @@
                         "type": "string"
                     },
                     "default": [],
-                    "description": "List of features to activate. Set to `rust-analyzer.cargo.features` if empty."
+                    "description": "List of features to activate. Defaults to `rust-analyzer.cargo.features`."
                 },
                 "rust-analyzer.inlayHints.enable": {
                     "type": "boolean",
-- 
cgit v1.2.3