feat: config for commands and args for test, bench and doctest runnables

dfireBird · dfireBird · commit 956e192f9b49 · 2025-12-21T22:41:39.000+05:30
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
@@ -908,12 +908,16 @@ 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()],
+        /// Arguments to passed for bench runnables.
+        runnables_bench_args: Vec<String> = vec![],
+        /// Subcommand used for bench runnables insted of `bench`.
+        runnables_bench_command: String = "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()],
+        /// Arguments to passed for doctest runnables.
+        runnables_doctest_args: Vec<String> = vec!["--doc".to_owned()],
+        /// Subcommand used for doctest runnables insted of `test`.
+        runnables_doctest_command: String = "test".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![],
@@ -925,8 +929,10 @@ 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()],
+        /// Arguments to passed for test runnables.
+        runnables_test_args: Vec<String> = vec![],
+        /// Subcommand used for test runnables insted of `test`.
+        runnables_test_command: String = "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
@@ -1578,12 +1584,18 @@ 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>,
+    /// Subcommand used for doctest runnables insted of `test`.
+    pub test_command: String,
+    /// Arguments to passed for test runnables.
+    pub test_args: Vec<String>,
+    /// Subcommand used for doctest runnables insted of `bench`.
+    pub bench_command: String,
+    /// Arguments to passed for bench runnables.
+    pub bench_args: Vec<String>,
+    /// Subcommand used for doctest runnables insted of `test`.
+    pub doctest_command: String,
+    /// Arguments to passed for doctest runnables.
+    pub doctest_args: Vec<String>,
 }
 
 /// Configuration for workspace symbol search requests.
@@ -2511,11 +2523,12 @@ 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(),
+            test_command: self.runnables_test_command(source_root).clone(),
+            test_args: self.runnables_test_args(source_root).clone(),
+            bench_command: self.runnables_bench_command(source_root).clone(),
+            bench_args: self.runnables_bench_args(source_root).clone(),
+            doctest_command: self.runnables_doctest_command(source_root).clone(),
+            doctest_args: self.runnables_doctest_args(source_root).clone(),
         }
     }
 
diff --git a/crates/rust-analyzer/src/target_spec.rs b/crates/rust-analyzer/src/target_spec.rs
@@ -123,7 +123,8 @@ impl CargoTargetSpec {
 
         match kind {
             RunnableKind::Test { test_id, attr } => {
-                cargo_args.extend(config.override_subcommand_test);
+                cargo_args.push(config.test_command);
+                cargo_args.extend(config.test_args);
                 executable_args.push(test_id.to_string());
                 if let TestId::Path(_) = test_id {
                     executable_args.push("--exact".to_owned());
@@ -134,31 +135,35 @@ impl CargoTargetSpec {
                 }
             }
             RunnableKind::TestMod { path } => {
-                cargo_args.extend(config.override_subcommand_test);
+                cargo_args.push(config.test_command);
+                cargo_args.extend(config.test_args);
                 executable_args.push(path.clone());
                 executable_args.extend(extra_test_binary_args);
             }
             RunnableKind::Bench { test_id } => {
-                cargo_args.extend(config.override_subcommand_bench);
+                cargo_args.push(config.bench_command);
+                cargo_args.extend(config.bench_args);
                 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.extend(config.override_subcommand_doctest);
+                cargo_args.push(config.doctest_command);
+                cargo_args.extend(config.doctest_args);
                 executable_args.push(test_id.to_string());
                 executable_args.extend(extra_test_binary_args);
             }
             RunnableKind::Bin => {
-                let subcommand = match spec {
+                let (subcommand, args) = match spec {
                     Some(CargoTargetSpec { target_kind: TargetKind::Test, .. }) => {
-                        config.override_subcommand_test
+                        (config.test_command, Some(config.test_args))
                     }
-                    _ => vec!["run".to_owned()],
+                    _ => ("run".to_owned(), None),
                 };
-                cargo_args.extend(subcommand);
+                cargo_args.push(subcommand);
+                cargo_args.extend(args.unwrap_or_default());
             }
         }
 
diff --git a/docs/book/src/configuration_generated.md b/docs/book/src/configuration_generated.md
@@ -1352,16 +1352,18 @@ Default: `false`
 Exclude tests from find-all-references and call-hierarchy.
 
 
-## rust-analyzer.runnables.bench.overrideCommand {#runnables.bench.overrideCommand}
+## rust-analyzer.runnables.bench.args {#runnables.bench.args}
 
-Default:
-```json
-[
-  "bench"
-]
-```
+Default: `[]`
 
-Override the subcommand used for bench runnables.
+Arguments to passed for bench runnables.
+
+
+## rust-analyzer.runnables.bench.command {#runnables.bench.command}
+
+Default: `"bench"`
+
+Subcommand used for bench runnables insted of `bench`.
 
 
 ## rust-analyzer.runnables.command {#runnables.command}
@@ -1371,17 +1373,23 @@ Default: `null`
 Command to be executed instead of 'cargo' for runnables.
 
 
-## rust-analyzer.runnables.doctest.overrideCommand {#runnables.doctest.overrideCommand}
+## rust-analyzer.runnables.doctest.args {#runnables.doctest.args}
 
 Default:
 ```json
 [
-  "test",
   "--doc"
 ]
 ```
 
-Override the subcommand used for doc test runnables.
+Arguments to passed for doctest runnables.
+
+
+## rust-analyzer.runnables.doctest.command {#runnables.doctest.command}
+
+Default: `"test"`
+
+Subcommand used for doctest runnables insted of `test`.
 
 
 ## rust-analyzer.runnables.extraArgs {#runnables.extraArgs}
@@ -1410,16 +1418,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}
+## rust-analyzer.runnables.test.args {#runnables.test.args}
 
-Default:
-```json
-[
-  "test"
-]
-```
+Default: `[]`
+
+Arguments to passed for test runnables.
+
+
+## rust-analyzer.runnables.test.command {#runnables.test.command}
+
+Default: `"test"`
 
-Override the subcommand used for test runnables.
+Subcommand used for test runnables insted of `test`.
 
 
 ## rust-analyzer.rustc.source {#rustc.source}
diff --git a/editors/code/package.json b/editors/code/package.json
@@ -2825,18 +2825,26 @@
             {
                 "title": "Runnables",
                 "properties": {
-                    "rust-analyzer.runnables.bench.overrideCommand": {
-                        "markdownDescription": "Override the subcommand used for bench runnables.",
-                        "default": [
-                            "bench"
-                        ],
+                    "rust-analyzer.runnables.bench.args": {
+                        "markdownDescription": "Arguments to passed for bench runnables.",
+                        "default": [],
                         "type": "array",
                         "items": {
                             "type": "string"
                         }
                     }
                 }
             },
+            {
+                "title": "Runnables",
+                "properties": {
+                    "rust-analyzer.runnables.bench.command": {
+                        "markdownDescription": "Subcommand used for bench runnables insted of `bench`.",
+                        "default": "bench",
+                        "type": "string"
+                    }
+                }
+            },
             {
                 "title": "Runnables",
                 "properties": {
@@ -2853,10 +2861,9 @@
             {
                 "title": "Runnables",
                 "properties": {
-                    "rust-analyzer.runnables.doctest.overrideCommand": {
-                        "markdownDescription": "Override the subcommand used for doc test runnables.",
+                    "rust-analyzer.runnables.doctest.args": {
+                        "markdownDescription": "Arguments to passed for doctest runnables.",
                         "default": [
-                            "test",
                             "--doc"
                         ],
                         "type": "array",
@@ -2866,6 +2873,16 @@
                     }
                 }
             },
+            {
+                "title": "Runnables",
+                "properties": {
+                    "rust-analyzer.runnables.doctest.command": {
+                        "markdownDescription": "Subcommand used for doctest runnables insted of `test`.",
+                        "default": "test",
+                        "type": "string"
+                    }
+                }
+            },
             {
                 "title": "Runnables",
                 "properties": {
@@ -2897,18 +2914,26 @@
             {
                 "title": "Runnables",
                 "properties": {
-                    "rust-analyzer.runnables.test.overrideCommand": {
-                        "markdownDescription": "Override the subcommand used for test runnables.",
-                        "default": [
-                            "test"
-                        ],
+                    "rust-analyzer.runnables.test.args": {
+                        "markdownDescription": "Arguments to passed for test runnables.",
+                        "default": [],
                         "type": "array",
                         "items": {
                             "type": "string"
                         }
                     }
                 }
             },
+            {
+                "title": "Runnables",
+                "properties": {
+                    "rust-analyzer.runnables.test.command": {
+                        "markdownDescription": "Subcommand used for test runnables insted of `test`.",
+                        "default": "test",
+                        "type": "string"
+                    }
+                }
+            },
             {
                 "title": "Rustc",
                 "properties": {
