From db35a58a613f9807cb34cd44c997318b3d93edba Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 May 2022 22:04:55 -0700
Subject: [PATCH] Skip duplicate recipe arguments (#1174)

---
 src/justfile.rs | 39 +++++++++++++++++++++------------------
 tests/lib.rs    |  1 +
 tests/run.rs    | 19 +++++++++++++++++++
 3 files changed, 41 insertions(+), 18 deletions(-)
 create mode 100644 tests/run.rs

diff --git a/src/justfile.rs b/src/justfile.rs
index ce0ce9f..718f2fd 100644
--- a/src/justfile.rs
+++ b/src/justfile.rs
@@ -284,6 +284,15 @@ impl<'src> Justfile<'src> {
     search: &Search,
     ran: &mut BTreeSet<Vec<String>>,
   ) -> RunResult<'src, ()> {
+    let mut invocation = vec![recipe.name().to_owned()];
+    for argument in arguments {
+      invocation.push((*argument).to_string());
+    }
+
+    if ran.contains(&invocation) {
+      return Ok(());
+    }
+
     let (outer, positional) = Evaluator::evaluate_parameters(
       context.config,
       dotenv,
@@ -300,20 +309,19 @@ impl<'src> Justfile<'src> {
       Evaluator::recipe_evaluator(context.config, dotenv, &scope, context.settings, search);
 
     for Dependency { recipe, arguments } in recipe.dependencies.iter().take(recipe.priors) {
-      let mut invocation = vec![recipe.name().to_owned()];
+      let arguments = arguments
+        .iter()
+        .map(|argument| evaluator.evaluate_expression(argument))
+        .collect::<RunResult<Vec<String>>>()?;
 
-      for argument in arguments {
-        invocation.push(evaluator.evaluate_expression(argument)?);
-      }
-
-      if !ran.contains(&invocation) {
-        let arguments = invocation
-          .iter()
-          .skip(1)
-          .map(String::as_ref)
-          .collect::<Vec<&str>>();
-        self.run_recipe(context, recipe, &arguments, dotenv, search, ran)?;
-      }
+      self.run_recipe(
+        context,
+        recipe,
+        &arguments.iter().map(String::as_ref).collect::<Vec<&str>>(),
+        dotenv,
+        search,
+        ran,
+      )?;
     }
 
     recipe.run(context, dotenv, scope.child(), search, &positional)?;
@@ -339,11 +347,6 @@ impl<'src> Justfile<'src> {
       }
     }
 
-    let mut invocation = vec![recipe.name().to_owned()];
-    for argument in arguments {
-      invocation.push((*argument).to_string());
-    }
-
     ran.insert(invocation);
     Ok(())
   }
diff --git a/tests/lib.rs b/tests/lib.rs
index 798b045..04ca439 100644
--- a/tests/lib.rs
+++ b/tests/lib.rs
@@ -33,6 +33,7 @@ mod quiet;
 mod quote;
 mod readme;
 mod regexes;
+mod run;
 mod search;
 mod shebang;
 mod shell;
diff --git a/tests/run.rs b/tests/run.rs
new file mode 100644
index 0000000..2d7d7d3
--- /dev/null
+++ b/tests/run.rs
@@ -0,0 +1,19 @@
+use crate::common::*;
+
+#[test]
+fn dont_run_duplicate_recipes() {
+  Test::new()
+    .justfile(
+      "
+      foo:
+        # foo
+    ",
+    )
+    .args(&["foo", "foo"])
+    .stderr(
+      "
+      # foo
+    ",
+    )
+    .run();
+}