Flip default features config

Author: Veykril

crates/rust-analyzer/src/config.rs

@@ -67,10 +67,10 @@ config_data! {
         /// Use `RUSTC_WRAPPER=rust-analyzer` when running build scripts to
         /// avoid compiling unnecessary things.
         cargo_buildScripts_useRustcWrapper: bool = "true",
+        /// Do not activate the `default` feature.
+        cargo_defaultFeatures: bool    = "true",
         /// List of features to activate. Set to `"all"` to pass `--all-features` to cargo.
         cargo_features: CargoFeatures      = "[]",
-        /// Do not activate the `default` feature.
-        cargo_noDefaultFeatures: bool    = "false",
         /// Internal config for debugging, disables loading of sysroot crates.
         cargo_noSysroot: bool            = "false",
         /// Compilation target override (target triple).
@@ -82,15 +82,15 @@ config_data! {
         checkOnSave_allTargets: bool                     = "true",
         /// Cargo command to use for `cargo check`.
         checkOnSave_command: String                      = "\"check\"",
+        /// Do not activate the `default` feature.
+        checkOnSave_defaultFeatures: Option<bool>      = "null",
         /// Run specified `cargo check` command for diagnostics on save.
         checkOnSave_enable: bool                         = "true",
         /// Extra arguments for `cargo check`.
         checkOnSave_extraArgs: Vec<String>               = "[]",
         /// List of features to activate. Defaults to
         /// `#rust-analyzer.cargo.features#`. Set to `"all"` to pass `--all-features` to cargo.
         checkOnSave_features: Option<CargoFeatures>      = "null",
-        /// Do not activate the `default` feature.
-        checkOnSave_noDefaultFeatures: Option<bool>      = "null",
         /// Advanced option, fully override the command rust-analyzer uses for
         /// checking. The command should include `--message-format=json` or
         /// similar option.
@@ -877,7 +877,7 @@ impl Config {
         });
 
         CargoConfig {
-            no_default_features: self.data.cargo_noDefaultFeatures,
+            no_default_features: !self.data.cargo_defaultFeatures,
             all_features: matches!(self.data.cargo_features, CargoFeatures::All),
             features: match &self.data.cargo_features {
                 CargoFeatures::All => vec![],
@@ -924,10 +924,10 @@ impl Config {
                     .clone()
                     .or_else(|| self.data.cargo_target.clone()),
                 all_targets: self.data.checkOnSave_allTargets,
-                no_default_features: self
+                no_default_features: !self
                     .data
-                    .checkOnSave_noDefaultFeatures
-                    .unwrap_or(self.data.cargo_noDefaultFeatures),
+                    .checkOnSave_defaultFeatures
+                    .unwrap_or(self.data.cargo_defaultFeatures),
                 all_features: matches!(
                     self.data.checkOnSave_features.as_ref().unwrap_or(&self.data.cargo_features),
                     CargoFeatures::All

docs/user/generated_config.adoc

@@ -27,15 +27,15 @@ include `--message-format=json` or a similar option.
 Use `RUSTC_WRAPPER=rust-analyzer` when running build scripts to
 avoid compiling unnecessary things.
 --
-[[rust-analyzer.cargo.features]]rust-analyzer.cargo.features (default: `[]`)::
+[[rust-analyzer.cargo.defaultFeatures]]rust-analyzer.cargo.defaultFeatures (default: `true`)::
 +
 --
-List of features to activate. Set to `"all"` to pass `--all-features` to cargo.
+Do not activate the `default` feature.
 --
-[[rust-analyzer.cargo.noDefaultFeatures]]rust-analyzer.cargo.noDefaultFeatures (default: `false`)::
+[[rust-analyzer.cargo.features]]rust-analyzer.cargo.features (default: `[]`)::
 +
 --
-Do not activate the `default` feature.
+List of features to activate. Set to `"all"` to pass `--all-features` to cargo.
 --
 [[rust-analyzer.cargo.noSysroot]]rust-analyzer.cargo.noSysroot (default: `false`)::
 +
@@ -62,6 +62,11 @@ Check all targets and tests (`--all-targets`).
 --
 Cargo command to use for `cargo check`.
 --
+[[rust-analyzer.checkOnSave.defaultFeatures]]rust-analyzer.checkOnSave.defaultFeatures (default: `null`)::
++
+--
+Do not activate the `default` feature.
+--
 [[rust-analyzer.checkOnSave.enable]]rust-analyzer.checkOnSave.enable (default: `true`)::
 +
 --
@@ -78,11 +83,6 @@ Extra arguments for `cargo check`.
 List of features to activate. Defaults to
 `#rust-analyzer.cargo.features#`. Set to `"all"` to pass `--all-features` to cargo.
 --
-[[rust-analyzer.checkOnSave.noDefaultFeatures]]rust-analyzer.checkOnSave.noDefaultFeatures (default: `null`)::
-+
---
-Do not activate the `default` feature.
---
 [[rust-analyzer.checkOnSave.overrideCommand]]rust-analyzer.checkOnSave.overrideCommand (default: `null`)::
 +
 --

editors/code/package.json

@@ -407,6 +407,11 @@
                     "default": true,
                     "type": "boolean"
                 },
+                "rust-analyzer.cargo.defaultFeatures": {
+                    "markdownDescription": "Do not activate the `default` feature.",
+                    "default": true,
+                    "type": "boolean"
+                },
                 "rust-analyzer.cargo.features": {
                     "markdownDescription": "List of features to activate. Set to `\"all\"` to pass `--all-features` to cargo.",
                     "default": [],
@@ -424,11 +429,6 @@
                         "Pass `--all-features` to cargo"
                     ]
                 },
-                "rust-analyzer.cargo.noDefaultFeatures": {
-                    "markdownDescription": "Do not activate the `default` feature.",
-                    "default": false,
-                    "type": "boolean"
-                },
                 "rust-analyzer.cargo.noSysroot": {
                     "markdownDescription": "Internal config for debugging, disables loading of sysroot crates.",
                     "default": false,
@@ -462,6 +462,14 @@
                     "default": "check",
                     "type": "string"
                 },
+                "rust-analyzer.checkOnSave.defaultFeatures": {
+                    "markdownDescription": "Do not activate the `default` feature.",
+                    "default": null,
+                    "type": [
+                        "null",
+                        "boolean"
+                    ]
+                },
                 "rust-analyzer.checkOnSave.enable": {
                     "markdownDescription": "Run specified `cargo check` command for diagnostics on save.",
                     "default": true,
@@ -493,14 +501,6 @@
                         "Pass `--all-features` to cargo"
                     ]
                 },
-                "rust-analyzer.checkOnSave.noDefaultFeatures": {
-                    "markdownDescription": "Do not activate the `default` feature.",
-                    "default": null,
-                    "type": [
-                        "null",
-                        "boolean"
-                    ]
-                },
                 "rust-analyzer.checkOnSave.overrideCommand": {
                     "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for\nchecking. The command should include `--message-format=json` or\nsimilar option.",
                     "default": null,