Tentatively fix macro function's child scope reconstruction

jasmith-hs · jasmith-hs · commit 9636a6e56046 · 2024-09-11T10:50:44.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/lib/fn/MacroFunction.java b/src/main/java/com/hubspot/jinjava/lib/fn/MacroFunction.java
@@ -127,6 +127,11 @@ public String getEvaluationResult(
             );
         } else {
           if (!alreadyDeferredInEarlierCall(scopeEntry.getKey(), interpreter)) {
+            if (
+              interpreter.getContext().get(scopeEntry.getKey()) == scopeEntry.getValue()
+            ) {
+              continue; // don't override if it's the same object
+            }
             interpreter.getContext().put(scopeEntry.getKey(), scopeEntry.getValue());
           }
         }
diff --git a/src/main/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunction.java b/src/main/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunction.java
@@ -126,6 +126,12 @@ public Object doEvaluate(
         );
       throw new DeferredInvocationResolutionException(tempVarName);
     }
+    if (!eagerExecutionResult.getResult().isFullyResolved()) {
+      return EagerReconstructionUtils.wrapInChildScope(
+        eagerExecutionResult.getResult().toString(true),
+        interpreter
+      );
+    }
     return eagerExecutionResult.getResult().toString(true);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,11 @@ public String getEvaluationResult(`
`127`	`127`	`);`
`128`	`128`	`} else {`
`129`	`129`	`if (!alreadyDeferredInEarlierCall(scopeEntry.getKey(), interpreter)) {`
	`130`	`+ if (`
	`131`	`+ interpreter.getContext().get(scopeEntry.getKey()) == scopeEntry.getValue()`
	`132`	`+ ) {`
	`133`	`+ continue; // don't override if it's the same object`
	`134`	`+ }`
`130`	`135`	`interpreter.getContext().put(scopeEntry.getKey(), scopeEntry.getValue());`
`131`	`136`	`}`
`132`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,12 @@ public Object doEvaluate(`
`126`	`126`	`);`
`127`	`127`	`throw new DeferredInvocationResolutionException(tempVarName);`
`128`	`128`	`}`
	`129`	`+ if (!eagerExecutionResult.getResult().isFullyResolved()) {`
	`130`	`+ return EagerReconstructionUtils.wrapInChildScope(`
	`131`	`+ eagerExecutionResult.getResult().toString(true),`
	`132`	`+ interpreter`
	`133`	`+ );`
	`134`	`+ }`
`129`	`135`	`return eagerExecutionResult.getResult().toString(true);`
`130`	`136`	`}`
`131`	`137`