Fix overrides not being visible in user-defined functions (#3307)

Author: casey

src/evaluator.rs

@@ -152,6 +152,7 @@ impl<'src, 'run> Evaluator<'src, 'run> {
       config,
       dotenv,
       module,
+      overrides,
       search,
     };
 
@@ -238,14 +239,13 @@ impl<'src, 'run> Evaluator<'src, 'run> {
       });
     }
 
-    let overrides = HashMap::new();
     let mut evaluator = Evaluator {
       assignments: Some(&context.module.assignments),
       context: Some(context),
       env: BTreeMap::new(),
       is_dependency: false,
       non_const_assignments: Table::new(),
-      overrides: &overrides,
+      overrides: self.overrides,
       scope,
     };
 
@@ -589,14 +589,13 @@ impl<'src, 'run> Evaluator<'src, 'run> {
     is_dependency: bool,
     scope: &'run Scope<'src, 'run>,
   ) -> Self {
-    static OVERRIDES: LazyLock<HashMap<Number, String>> = LazyLock::new(HashMap::new);
     Self {
       assignments: None,
       context: Some(*context),
       env,
       is_dependency,
       non_const_assignments: Table::new(),
-      overrides: &OVERRIDES,
+      overrides: context.overrides,
       scope: scope.child(),
     }
   }

src/execution_context.rs

@@ -5,6 +5,7 @@ pub(crate) struct ExecutionContext<'src: 'run, 'run> {
   pub(crate) config: &'run Config,
   pub(crate) dotenv: &'run BTreeMap<String, String>,
   pub(crate) module: &'run Justfile<'src>,
+  pub(crate) overrides: &'run HashMap<Number, String>,
   pub(crate) search: &'run Search,
 }
 

src/justfile.rs

@@ -223,6 +223,7 @@ impl<'src> Justfile<'src> {
             &invocation.arguments,
             config,
             false,
+            overrides,
             &ran,
             invocation.recipe,
             &scopes,
@@ -419,6 +420,7 @@ impl<'src> Justfile<'src> {
     arguments: &[Vec<String>],
     config: &Config,
     is_dependency: bool,
+    overrides: &HashMap<Number, String>,
     ran: &Ran,
     recipe: &Recipe<'src>,
     scopes: &Scopes<'src, '_>,
@@ -440,6 +442,7 @@ impl<'src> Justfile<'src> {
       config,
       dotenv,
       module,
+      overrides,
       search,
     };
 
@@ -467,6 +470,7 @@ impl<'src> Justfile<'src> {
       &context,
       recipe.priors(),
       &mut evaluator,
+      overrides,
       ran,
       recipe,
       scopes,
@@ -480,6 +484,7 @@ impl<'src> Justfile<'src> {
       &context,
       recipe.subsequents(),
       &mut evaluator,
+      overrides,
       &Ran::default(),
       recipe,
       scopes,
@@ -496,6 +501,7 @@ impl<'src> Justfile<'src> {
     context: &ExecutionContext<'src, 'run>,
     dependencies: &[Dependency<'src>],
     evaluator: &mut Evaluator<'src, 'run>,
+    overrides: &HashMap<Number, String>,
     ran: &Ran,
     recipe: &Recipe<'src>,
     scopes: &Scopes<'src, 'run>,
@@ -523,7 +529,9 @@ impl<'src> Justfile<'src> {
         let mut handles = Vec::new();
         for (recipe, arguments) in evaluated {
           handles.push(thread_scope.spawn(move || {
-            Self::run_recipe(&arguments, config, true, ran, recipe, scopes, search)
+            Self::run_recipe(
+              &arguments, config, true, overrides, ran, recipe, scopes, search,
+            )
           }));
         }
         for handle in handles {
@@ -535,7 +543,9 @@ impl<'src> Justfile<'src> {
       })?;
     } else {
       for (recipe, arguments) in evaluated {
-        Self::run_recipe(&arguments, config, true, ran, recipe, scopes, search)?;
+        Self::run_recipe(
+          &arguments, config, true, overrides, ran, recipe, scopes, search,
+        )?;
       }
     }
 

tests/function_definitions.rs

@@ -338,6 +338,24 @@ fn has_access_to_env_file() {
     .success();
 }
 
+#[test]
+fn may_reference_overrides() {
+  Test::new()
+    .justfile(
+      "
+        x := 'bar'
+        foo() := x
+
+        a:
+          @echo {{foo()}}
+      ",
+    )
+    .args(["x=baz", "a"])
+    .stdout("baz\n")
+    .env("JUST_UNSTABLE", "1")
+    .success();
+}
+
 #[test]
 fn may_reference_non_const_assignment() {
   Test::new()