Preserve the setting of a variable when calling eager macro function.

Author: hs-lsong

src/main/java/com/hubspot/jinjava/lib/tag/ForTag.java

@@ -15,6 +15,8 @@
  **********************************************************************/
 package com.hubspot.jinjava.lib.tag;
 
+import static com.hubspot.jinjava.util.Logging.ENGINE_LOG;
+
 import com.google.common.collect.Lists;
 import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
 import com.hubspot.jinjava.doc.annotations.JinjavaHasCodeBody;
@@ -165,6 +167,7 @@ public String renderForCollection(
     Object collection
   ) {
     ForLoop loop = ObjectIterator.getLoop(collection);
+    int loopCount = 0;
 
     try (InterpreterScopeClosable c = interpreter.enterScope()) {
       if (interpreter.isValidationMode() && !loop.hasNext()) {
@@ -178,6 +181,7 @@ public String renderForCollection(
         interpreter.getConfig().getMaxOutputSize()
       );
       while (loop.hasNext()) {
+        ++loopCount;
         Object val;
         try {
           val = interpreter.wrap(loop.next());
@@ -274,6 +278,8 @@ public String renderForCollection(
         }
       }
       return checkLoopVariable(interpreter, buff);
+    } finally {
+      ENGINE_LOG.error("Loop count {}", loopCount);
     }
   }
 

src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerCallTag.java

@@ -41,7 +41,7 @@ public String eagerInterpret(
     InterpretException e
   ) {
     interpreter.getContext().checkNumberOfDeferredTokens();
-    try (InterpreterScopeClosable c = interpreter.enterScope()) {
+    try (InterpreterScopeClosable c = interpreter.enterNonStackingScope()) {
       MacroFunction caller = new MacroFunction(
         tagNode.getChildren(),
         "caller",

src/test/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunctionTest.java

@@ -77,6 +77,20 @@ public void itReconstructsForAliasedName() {
       .isEqualTo(String.format(codeFormat, fullName));
   }
 
+  @Test
+  public void itResolvesFromSet() {
+    String template =
+      "{% macro foo(foobar, other) %}" +
+      " {% do foobar.update({'a': 'b'} ) %} " +
+      " {{ foobar }}  and {{ other }}" +
+      "{% endmacro %}" +
+      "{% set bar = {}  %}" +
+      "{% call foo(bar, deferred) %} {% endcall %}" +
+      "{{ bar }}";
+    String firstPass = interpreter.render(template);
+    assertThat(firstPass).isEqualTo(template);
+  }
+
   @Test
   public void itReconstructsImageWithNamedParams() {
     String name = "foo";