feat: implement configuration to change sub command for test, bench and doctest

Author: dfireBird

crates/rust-analyzer/src/config.rs

@@ -908,8 +908,12 @@ config_data! {
         /// This config takes a map of crate names with the exported proc-macro names to ignore as values.
         procMacro_ignored: FxHashMap<Box<str>, Box<[Box<str>]>>          = FxHashMap::default(),
 
+        /// Override the subcommand used for bench runnables.
+        runnables_bench_overrideCommand: Vec<String> = vec!["bench".to_owned()],
         /// Command to be executed instead of 'cargo' for runnables.
         runnables_command: Option<String> = None,
+        /// Override the subcommand used for doc test runnables.
+        runnables_doctest_overrideCommand: Vec<String> = vec!["test".to_owned(), "--doc".to_owned()],
         /// Additional arguments to be passed to cargo for runnables such as
         /// tests or binaries. For example, it may be `--release`.
         runnables_extraArgs: Vec<String>   = vec![],
@@ -921,6 +925,8 @@ config_data! {
         /// they will end up being interpreted as options to
         /// [`rustc`’s built-in test harness (“libtest”)](https://doc.rust-lang.org/rustc/tests/index.html#cli-arguments).
         runnables_extraTestBinaryArgs: Vec<String> = vec!["--nocapture".to_owned()],
+        /// Override the subcommand used for test runnables.
+        runnables_test_overrideCommand: Vec<String> = vec!["test".to_owned()],
 
         /// Path to the Cargo.toml of the rust compiler workspace, for usage in rustc_private
         /// projects, or "discover" to try to automatically find it if the `rustc-dev` component
@@ -1572,6 +1578,12 @@ pub struct RunnablesConfig {
     pub cargo_extra_args: Vec<String>,
     /// Additional arguments for the binary being run, if it is a test or benchmark.
     pub extra_test_binary_args: Vec<String>,
+    /// Override subcommand to be used for test runnables.
+    pub override_subcommand_test: Vec<String>,
+    /// Override subcommand to be used for bench runnables.
+    pub override_subcommand_bench: Vec<String>,
+    /// Override subcommand to be used for doc test runnables.
+    pub override_subcommand_doctest: Vec<String>,
 }
 
 /// Configuration for workspace symbol search requests.
@@ -2499,6 +2511,11 @@ impl Config {
             override_cargo: self.runnables_command(source_root).clone(),
             cargo_extra_args: self.runnables_extraArgs(source_root).clone(),
             extra_test_binary_args: self.runnables_extraTestBinaryArgs(source_root).clone(),
+            override_subcommand_test: self.runnables_test_overrideCommand(source_root).clone(),
+            override_subcommand_bench: self.runnables_bench_overrideCommand(source_root).clone(),
+            override_subcommand_doctest: self
+                .runnables_doctest_overrideCommand(source_root)
+                .clone(),
         }
     }
 

crates/rust-analyzer/src/target_spec.rs

@@ -123,7 +123,7 @@ impl CargoTargetSpec {
 
         match kind {
             RunnableKind::Test { test_id, attr } => {
-                cargo_args.push("test".to_owned());
+                cargo_args.extend(config.override_subcommand_test);
                 executable_args.push(test_id.to_string());
                 if let TestId::Path(_) = test_id {
                     executable_args.push("--exact".to_owned());
@@ -134,30 +134,31 @@ impl CargoTargetSpec {
                 }
             }
             RunnableKind::TestMod { path } => {
-                cargo_args.push("test".to_owned());
+                cargo_args.extend(config.override_subcommand_test);
                 executable_args.push(path.clone());
                 executable_args.extend(extra_test_binary_args);
             }
             RunnableKind::Bench { test_id } => {
-                cargo_args.push("bench".to_owned());
+                cargo_args.extend(config.override_subcommand_bench);
                 executable_args.push(test_id.to_string());
                 if let TestId::Path(_) = test_id {
                     executable_args.push("--exact".to_owned());
                 }
                 executable_args.extend(extra_test_binary_args);
             }
             RunnableKind::DocTest { test_id } => {
-                cargo_args.push("test".to_owned());
-                cargo_args.push("--doc".to_owned());
+                cargo_args.extend(config.override_subcommand_doctest);
                 executable_args.push(test_id.to_string());
                 executable_args.extend(extra_test_binary_args);
             }
             RunnableKind::Bin => {
                 let subcommand = match spec {
-                    Some(CargoTargetSpec { target_kind: TargetKind::Test, .. }) => "test",
-                    _ => "run",
+                    Some(CargoTargetSpec { target_kind: TargetKind::Test, .. }) => {
+                        config.override_subcommand_test
+                    }
+                    _ => vec!["run".to_owned()],
                 };
-                cargo_args.push(subcommand.to_owned());
+                cargo_args.extend(subcommand);
             }
         }
 

docs/book/src/configuration_generated.md

@@ -1352,13 +1352,38 @@ Default: `false`
 Exclude tests from find-all-references and call-hierarchy.
 
 
+## rust-analyzer.runnables.bench.overrideCommand {#runnables.bench.overrideCommand}
+
+Default:
+```json
+[
+  "bench"
+]
+```
+
+Override the subcommand used for bench runnables.
+
+
 ## rust-analyzer.runnables.command {#runnables.command}
 
 Default: `null`
 
 Command to be executed instead of 'cargo' for runnables.
 
 
+## rust-analyzer.runnables.doctest.overrideCommand {#runnables.doctest.overrideCommand}
+
+Default:
+```json
+[
+  "test",
+  "--doc"
+]
+```
+
+Override the subcommand used for doc test runnables.
+
+
 ## rust-analyzer.runnables.extraArgs {#runnables.extraArgs}
 
 Default: `[]`
@@ -1385,6 +1410,18 @@ they will end up being interpreted as options to
 [`rustc`’s built-in test harness (“libtest”)](https://doc.rust-lang.org/rustc/tests/index.html#cli-arguments).
 
 
+## rust-analyzer.runnables.test.overrideCommand {#runnables.test.overrideCommand}
+
+Default:
+```json
+[
+  "test"
+]
+```
+
+Override the subcommand used for test runnables.
+
+
 ## rust-analyzer.rustc.source {#rustc.source}
 
 Default: `null`

editors/code/package.json

@@ -2822,6 +2822,21 @@
                     }
                 }
             },
+            {
+                "title": "Runnables",
+                "properties": {
+                    "rust-analyzer.runnables.bench.overrideCommand": {
+                        "markdownDescription": "Override the subcommand used for bench runnables.",
+                        "default": [
+                            "bench"
+                        ],
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                }
+            },
             {
                 "title": "Runnables",
                 "properties": {
@@ -2835,6 +2850,22 @@
                     }
                 }
             },
+            {
+                "title": "Runnables",
+                "properties": {
+                    "rust-analyzer.runnables.doctest.overrideCommand": {
+                        "markdownDescription": "Override the subcommand used for doc test runnables.",
+                        "default": [
+                            "test",
+                            "--doc"
+                        ],
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                }
+            },
             {
                 "title": "Runnables",
                 "properties": {
@@ -2863,6 +2894,21 @@
                     }
                 }
             },
+            {
+                "title": "Runnables",
+                "properties": {
+                    "rust-analyzer.runnables.test.overrideCommand": {
+                        "markdownDescription": "Override the subcommand used for test runnables.",
+                        "default": [
+                            "test"
+                        ],
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                }
+            },
             {
                 "title": "Rustc",
                 "properties": {