Allow shell runnables to define test commands with substitution in ar…

…guments
rust-lang · Mar 15, 2024 · 65e9be3 · 65e9be3
1 parent b1fc71f
commit 65e9be3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/crates/project-model/src/project_json.rs b/crates/project-model/src/project_json.rs
@@ -272,6 +272,7 @@ pub struct ShellRunnableArgs {
 pub enum ShellRunnableKind {
     Check,
     Run,
+    TestOne,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Deserialize)]

diff --git a/crates/rust-analyzer/src/target_spec.rs b/crates/rust-analyzer/src/target_spec.rs
@@ -78,7 +78,24 @@ impl ProjectJsonTargetSpec {
 
                 None
             }
-            RunnableKind::Test { .. } => None,
+            RunnableKind::Test { test_id, .. } => {
+                for runnable in &self.shell_runnables {
+                    if matches!(runnable.kind, ShellRunnableKind::TestOne) {
+                        let mut runnable = runnable.clone();
+
+                        let replaced_args: Vec<_> = runnable
+                            .args
+                            .iter()
+                            .map(|arg| arg.replace("$$TEST_NAME$$", &test_id.to_string()))
+                            .collect();
+                        runnable.args = replaced_args;
+
+                        return Some(runnable);
+                    }
+                }
+
+                None
+            }
             RunnableKind::TestMod { .. } => None,
             RunnableKind::Bench { .. } => None,
             RunnableKind::DocTest { .. } => None,