Keep reconstructing the interpreter as ____int3rpr3t3r____ so that the

jasmith-hs · jasmith-hs · commit 5450ee83db5c · 2026-04-24T10:42:27.000-04:00
eager execution output template string itself is backwards compatible
with Jinjava 2.8.x
diff --git a/src/main/java/com/hubspot/jinjava/el/ext/ExtendedParser.java b/src/main/java/com/hubspot/jinjava/el/ext/ExtendedParser.java
@@ -129,7 +129,7 @@ public AstNode createAstNode(AstNode... children) {
   }
 
   protected AstNode interpreter() {
-    return new AstNull();
+    return identifier(INTERPRETER);
   }
 
   @Override
diff --git a/src/main/java/com/hubspot/jinjava/el/ext/eager/EvalResultHolder.java b/src/main/java/com/hubspot/jinjava/el/ext/eager/EvalResultHolder.java
@@ -76,12 +76,14 @@ static String reconstructNode(
     if (astNode == null) {
       return "";
     }
+    if (
+      astNode instanceof AstIdentifier &&
+      ExtendedParser.INTERPRETER.equals(((AstIdentifier) astNode).getName())
+    ) {
+      return ExtendedParser.INTERPRETER;
+    }
     preserveIdentifier =
-      IdentifierPreservationStrategy.preserving(
-        preserveIdentifier.isPreserving() ||
-        (astNode instanceof AstIdentifier &&
-          ExtendedParser.INTERPRETER.equals(((AstIdentifier) astNode).getName()))
-      );
+      IdentifierPreservationStrategy.preserving(preserveIdentifier.isPreserving());
     if (
       preserveIdentifier.isPreserving() &&
       !astNode.hasEvalResult() &&
diff --git a/src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerCycleTag.java b/src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerCycleTag.java
@@ -245,7 +245,7 @@ private static String getIsIterable(String var, int forIndex, TagToken tagToken)
       ) +
       // modulo indexing
       String.format(
-        "{{ %s[%d %% filter:length.filter(%s, null)] }}",
+        "{{ %s[%d %% filter:length.filter(%s, ____int3rpr3t3r____)] }}",
         var,
         forIndex,
         var
diff --git a/src/test/java/com/hubspot/jinjava/EagerTest.java b/src/test/java/com/hubspot/jinjava/EagerTest.java
@@ -216,7 +216,7 @@ public void itPreserveDeferredVariableResolvingEqualToInOrCondition() {
 
     assertThat(output)
       .isEqualTo(
-        "{% if false || exptest:equalto.evaluate('a', null, deferred) %}preserved{% endif %}"
+        "{% if false || exptest:equalto.evaluate('a', ____int3rpr3t3r____, deferred) %}preserved{% endif %}"
       );
     assertThat(interpreter.getErrors()).isEmpty();
     localContext.put("deferred", "a");
@@ -307,7 +307,8 @@ public void itPreservesForTag() {
   @Test
   public void itPreservesFilters() {
     String output = interpreter.render("{{ deferred|capitalize }}");
-    assertThat(output).isEqualTo("{{ filter:capitalize.filter(deferred, null) }}");
+    assertThat(output)
+      .isEqualTo("{{ filter:capitalize.filter(deferred, ____int3rpr3t3r____) }}");
     assertThat(interpreter.getErrors()).isEmpty();
     localContext.put("deferred", "foo");
     assertThat(interpreter.render(output)).isEqualTo("Foo");
@@ -317,14 +318,17 @@ public void itPreservesFilters() {
   public void itPreservesFunctions() {
     String output = interpreter.render("{{ deferred|datetimeformat('%B %e, %Y') }}");
     assertThat(output)
-      .isEqualTo("{{ filter:datetimeformat.filter(deferred, null, '%B %e, %Y') }}");
+      .isEqualTo(
+        "{{ filter:datetimeformat.filter(deferred, ____int3rpr3t3r____, '%B %e, %Y') }}"
+      );
     assertThat(interpreter.getErrors()).isEmpty();
   }
 
   @Test
   public void itPreservesRandomness() {
     String output = interpreter.render("{{ [1, 2, 3]|shuffle }}");
-    assertThat(output).isEqualTo("{{ filter:shuffle.filter([1, 2, 3], null) }}");
+    assertThat(output)
+      .isEqualTo("{{ filter:shuffle.filter([1, 2, 3], ____int3rpr3t3r____) }}");
     assertThat(interpreter.getErrors()).isEmpty();
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/ExtendedParserTest.java b/src/test/java/com/hubspot/jinjava/el/ext/ExtendedParserTest.java
@@ -11,7 +11,6 @@
 import de.odysseus.el.tree.impl.ast.AstMethod;
 import de.odysseus.el.tree.impl.ast.AstNested;
 import de.odysseus.el.tree.impl.ast.AstNode;
-import de.odysseus.el.tree.impl.ast.AstNull;
 import de.odysseus.el.tree.impl.ast.AstParameters;
 import de.odysseus.el.tree.impl.ast.AstString;
 import org.assertj.core.api.Assertions;
@@ -176,10 +175,12 @@ private void assertForExpression(
 
     AstParameters astParameters = (AstParameters) astNode.getChild(1);
     assertThat(astParameters.getChild(0)).isInstanceOf(AstString.class);
-    assertThat(astParameters.getChild(1)).isInstanceOf(AstNull.class);
+    assertThat(astParameters.getChild(1)).isInstanceOf(AstIdentifier.class);
     assertThat(astParameters.getChild(2)).isInstanceOf(AstString.class);
 
     assertThat(astParameters.getChild(0).eval(null, null)).isEqualTo(leftExpected);
+    assertThat(((AstIdentifier) astParameters.getChild(1)).getName())
+      .isEqualTo("____int3rpr3t3r____");
     assertThat(astParameters.getChild(2).eval(null, null)).isEqualTo(rightExpected);
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstMethodTest.java b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstMethodTest.java
@@ -235,7 +235,7 @@ public void itPreservesUnresolvable() {
       fail("Should throw DeferredParsingException");
     } catch (DeferredParsingException e) {
       assertThat(e.getDeferredEvalResult())
-        .isEqualTo("filter:upper.filter(foo_object.deferred, null)");
+        .isEqualTo("filter:upper.filter(foo_object.deferred, ____int3rpr3t3r____)");
     }
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java
@@ -423,7 +423,7 @@ public void itCorrectlySetsAliasedPathForSecondPass() {
     assertThat(firstPassResult)
       .isEqualTo(
         "{% set deferred_import_resource_path = 'import-macro.jinja' %}{% macro m.print_path_macro(var) %}\n" +
-        "{{ filter:print_path.filter(var, null) }}\n" +
+        "{{ filter:print_path.filter(var, ____int3rpr3t3r____) }}\n" +
         "{{ var }}\n" +
         "{% endmacro %}{% set deferred_import_resource_path = null %}{{ m.print_path_macro(foo) }}"
       );
@@ -442,7 +442,7 @@ public void itCorrectlySetsPathForSecondPass() {
     assertThat(firstPassResult)
       .isEqualTo(
         "{% set deferred_import_resource_path = 'import-macro.jinja' %}{% macro print_path_macro(var) %}\n" +
-        "{{ filter:print_path.filter(var, null) }}\n" +
+        "{{ filter:print_path.filter(var, ____int3rpr3t3r____) }}\n" +
         "{{ var }}\n" +
         "{% endmacro %}{% set deferred_import_resource_path = null %}{{ print_path_macro(foo) }}"
       );
@@ -460,9 +460,9 @@ public void itCorrectlySetsNestedPathsForSecondPass() {
     );
     assertThat(firstPassResult)
       .isEqualTo(
-        "{% set deferred_import_resource_path = 'double-import-macro.jinja' %}{% macro print_path_macro2(var) %}{{ filter:print_path.filter(var, null) }}\n" +
+        "{% set deferred_import_resource_path = 'double-import-macro.jinja' %}{% macro print_path_macro2(var) %}{{ filter:print_path.filter(var, ____int3rpr3t3r____) }}\n" +
         "{% set deferred_import_resource_path = 'import-macro.jinja' %}{% macro print_path_macro(var) %}\n" +
-        "{{ filter:print_path.filter(var, null) }}\n" +
+        "{{ filter:print_path.filter(var, ____int3rpr3t3r____) }}\n" +
         "{{ var }}\n" +
         "{% endmacro %}{% set deferred_import_resource_path = 'double-import-macro.jinja' %}{{ print_path_macro(var) }}{% endmacro %}{% set deferred_import_resource_path = null %}{{ print_path_macro2(foo) }}"
       );
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerSetTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerSetTagTest.java
@@ -142,7 +142,9 @@ public void itDefersBlockWithFilter() {
     final String result = interpreter.render(template);
 
     assertThat(result)
-      .isEqualTo("{% set foo = filter:add.filter(2, null, deferred) %}{{ foo }}");
+      .isEqualTo(
+        "{% set foo = filter:add.filter(2, ____int3rpr3t3r____, deferred) %}{{ foo }}"
+      );
     assertThat(
       context
         .getDeferredTokens()
@@ -177,7 +179,7 @@ public void itDefersDeferredBlockWithDeferredFilter() {
 
     assertThat(result)
       .isEqualTo(
-        "{% set foo %}{{ 1 + deferred }}{% endset %}{% set foo = filter:add.filter(foo, null, filter:int.filter(deferred, null)) %}{{ foo }}"
+        "{% set foo %}{{ 1 + deferred }}{% endset %}{% set foo = filter:add.filter(foo, ____int3rpr3t3r____, filter:int.filter(deferred, ____int3rpr3t3r____)) %}{{ foo }}"
       );
     context.remove("foo");
     context.put("deferred", 2);
@@ -201,7 +203,7 @@ public void itDefersInDeferredExecutionModeWithFilter() {
 
     assertThat(result)
       .isEqualTo(
-        "{% set foo %}1{% endset %}{% set foo = filter:add.filter(1, null, deferred) %}{{ foo }}"
+        "{% set foo %}1{% endset %}{% set foo = filter:add.filter(1, ____int3rpr3t3r____, deferred) %}{{ foo }}"
       );
     assertThat(
       context
diff --git a/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java b/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
@@ -641,7 +641,7 @@ public void itHandlesDeferredExpTests() {
     interpreter.getContext().setThrowInterpreterErrors(true);
     String partiallyResolved = eagerExpressionResult.toString();
     assertThat(partiallyResolved)
-      .isEqualTo("exptest:equalto.evaluateNegated(4, null, deferred)");
+      .isEqualTo("exptest:equalto.evaluateNegated(4, ____int3rpr3t3r____, deferred)");
     assertThat(eagerExpressionResult.getDeferredWords())
       .containsExactlyInAnyOrder("deferred", "equalto.evaluateNegated");
     context.put("deferred", 4);
@@ -756,7 +756,7 @@ public void itHandlesDeferredMethod() {
     assertThat(eagerResolveExpression("deferred.append(foo)").toString())
       .isEqualTo("deferred.append('foo')");
     assertThat(eagerResolveExpression("deferred[1 + 1] | length").toString())
-      .isEqualTo("filter:length.filter(deferred[2], null)");
+      .isEqualTo("filter:length.filter(deferred[2], ____int3rpr3t3r____)");
   }
 
   @Test
@@ -823,7 +823,7 @@ public void itDoesNotSplitJsonInArrayResolvedExpression() {
   @Test
   public void itHandlesRandom() {
     assertThat(eagerResolveExpression("range(1)|random").toString())
-      .isEqualTo("filter:random.filter(range(1), null)");
+      .isEqualTo("filter:random.filter(range(1), ____int3rpr3t3r____)");
   }
 
   @Test
diff --git a/src/test/resources/eager/defers-macro-in-expression/test.expected.jinja b/src/test/resources/eager/defers-macro-in-expression/test.expected.jinja
@@ -1,10 +1,10 @@
 2
 {% macro plus(foo, add) %}\
-{{ foo + (filter:int.filter(add, null)) }}\
+{{ foo + (filter:int.filter(add, ____int3rpr3t3r____)) }}\
 {% endmacro %}\
 {{ plus(deferred, 1.1) }}\
 {% set deferred = deferred + 2 %}
 {% macro plus(foo, add) %}\
-{{ foo + (filter:int.filter(add, null)) }}\
+{{ foo + (filter:int.filter(add, ____int3rpr3t3r____)) }}\
 {% endmacro %}\
 {{ plus(deferred, 3.1) }}
diff --git a/src/test/resources/eager/defers-macro-in-for/test.expected.jinja b/src/test/resources/eager/defers-macro-in-for/test.expected.jinja
@@ -3,6 +3,6 @@
 {% do my_list.append(num) %}\
 {{ my_list }}\
 {% endmacro %}\
-{% for item in filter:split.filter(macro_append(deferred), null, ',', 2) %}
+{% for item in filter:split.filter(macro_append(deferred), ____int3rpr3t3r____, ',', 2) %}
 {{ item }}
 {% endfor %}
diff --git a/src/test/resources/eager/defers-macro-in-if/test.expected.jinja b/src/test/resources/eager/defers-macro-in-if/test.expected.jinja
@@ -3,6 +3,6 @@
 {% do my_list.append(num) %}\
 {{ my_list }}\
 {% endmacro %}\
-{% if [] == filter:split.filter(macro_append(deferred), null, ',', 2) %}
+{% if [] == filter:split.filter(macro_append(deferred), ____int3rpr3t3r____, ',', 2) %}
 {{ my_list }}
 {% endif %}
diff --git a/src/test/resources/eager/does-not-override-import-modification-in-for/test.expected.jinja b/src/test/resources/eager/does-not-override-import-modification-in-for/test.expected.jinja
@@ -11,7 +11,7 @@
 
 {% endif %}
 
-{% set foo = filter:join.filter([foo, 'b'], null, '') %}\
+{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_meta_import_alias_3016318__.update({'foo': foo}) %}
 {% do __temp_meta_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
@@ -25,12 +25,12 @@
 {% for __ignored__ in [0] %}\
 {% if deferred %}
 
-{% set foo = filter:join.filter([foo, 'a'], null, '') %}\
+{% set foo = filter:join.filter([foo, 'a'], ____int3rpr3t3r____, '') %}\
 {% do __temp_meta_import_alias_3016319__.update({'foo': foo}) %}
 
 {% endif %}
 
-{% set foo = filter:join.filter([foo, 'b'], null, '') %}\
+{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_meta_import_alias_3016319__.update({'foo': foo}) %}
 {% do __temp_meta_import_alias_3016319__.update({'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
@@ -45,12 +45,12 @@
 {% for __ignored__ in [0] %}\
 {% if deferred %}
 
-{% set foo = filter:join.filter([foo, 'a'], null, '') %}\
+{% set foo = filter:join.filter([foo, 'a'], ____int3rpr3t3r____, '') %}\
 {% do __temp_meta_import_alias_3016318__.update({'foo': foo}) %}
 
 {% endif %}
 
-{% set foo = filter:join.filter([foo, 'b'], null, '') %}\
+{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_meta_import_alias_3016318__.update({'foo': foo}) %}
 {% do __temp_meta_import_alias_3016318__.update({'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
@@ -64,12 +64,12 @@
 {% for __ignored__ in [0] %}\
 {% if deferred %}
 
-{% set foo = filter:join.filter([foo, 'a'], null, '') %}\
+{% set foo = filter:join.filter([foo, 'a'], ____int3rpr3t3r____, '') %}\
 {% do __temp_meta_import_alias_3016319__.update({'foo': foo}) %}
 
 {% endif %}
 
-{% set foo = filter:join.filter([foo, 'b'], null, '') %}\
+{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_meta_import_alias_3016319__.update({'foo': foo}) %}
 {% do __temp_meta_import_alias_3016319__.update({'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
diff --git a/src/test/resources/eager/fully-defers-filtered-macro/test.expected.jinja b/src/test/resources/eager/fully-defers-filtered-macro/test.expected.jinja
@@ -1,5 +1,5 @@
 {% macro flashy(foo) %}\
-{{ filter:upper.filter(foo, null) }}
+{{ filter:upper.filter(foo, ____int3rpr3t3r____) }}
   A flashy {{ deferred }}\
 .{% endmacro %}\
 {% set __macro_flashy_1625622909_temp_variable_0__ %}\
@@ -12,4 +12,4 @@ BAR
 {% set __macro_silly_2092874071_temp_variable_0__ %}\
 A silly {{ deferred }}\
 .{% endset %}\
-{{ filter:upper.filter(__macro_silly_2092874071_temp_variable_0__, null) }}
+{{ filter:upper.filter(__macro_silly_2092874071_temp_variable_0__, ____int3rpr3t3r____) }}
diff --git a/src/test/resources/eager/handles-deferred-cycle-as/test.expected.jinja b/src/test/resources/eager/handles-deferred-cycle-as/test.expected.jinja
@@ -1,19 +1,19 @@
 {% for __ignored__ in [0] %}
 {% set c = [1, deferred] %}
 {% if exptest:iterable.evaluate(c, null) %}\
-{{ c[0 % filter:length.filter(c, null)] }}\
+{{ c[0 % filter:length.filter(c, ____int3rpr3t3r____)] }}\
 {% else %}\
 {{ c }}\
 {% endif %}
 {% set c = [2, deferred] %}
 {% if exptest:iterable.evaluate(c, null) %}\
-{{ c[1 % filter:length.filter(c, null)] }}\
+{{ c[1 % filter:length.filter(c, ____int3rpr3t3r____)] }}\
 {% else %}\
 {{ c }}\
 {% endif %}
 {% set c = [3, deferred] %}
 {% if exptest:iterable.evaluate(c, null) %}\
-{{ c[2 % filter:length.filter(c, null)] }}\
+{{ c[2 % filter:length.filter(c, ____int3rpr3t3r____)] }}\
 {% else %}\
 {{ c }}\
 {% endif %}\
diff --git a/src/test/resources/eager/handles-deferred-for-loop-var-from-macro/test.expected.jinja b/src/test/resources/eager/handles-deferred-for-loop-var-from-macro/test.expected.jinja
@@ -5,12 +5,12 @@
 {% set __macro_doIt_1327224118_temp_variable_0__ %}
 {{ deferred ~ '{\"a\":\"a\"}' }}
 {% endset %}\
-{{ filter:upper.filter(__macro_doIt_1327224118_temp_variable_0__, null) }}
+{{ filter:upper.filter(__macro_doIt_1327224118_temp_variable_0__, ____int3rpr3t3r____) }}
 
 {% set __macro_doIt_1327224118_temp_variable_1__ %}
 {{ deferred ~ '{\"b\":\"b\"}' }}
 {% endset %}\
-{{ filter:upper.filter(__macro_doIt_1327224118_temp_variable_1__, null) }}
+{{ filter:upper.filter(__macro_doIt_1327224118_temp_variable_1__, ____int3rpr3t3r____) }}
 {% endfor %}
 {% endset %}\
-{{ filter:upper.filter(__macro_getData_357124436_temp_variable_0__, null) }}
+{{ filter:upper.filter(__macro_getData_357124436_temp_variable_0__, ____int3rpr3t3r____) }}
diff --git a/src/test/resources/eager/handles-deferred-value-in-render-filter/test.expected.jinja b/src/test/resources/eager/handles-deferred-value-in-render-filter/test.expected.jinja
@@ -1,9 +1,9 @@
-{% set __render_572171194_temp_variable__ %}\
-Hi {{ filter:escape.filter(deferred, null) }}\
+{% set __render_524436216_temp_variable__ %}\
+Hi {{ filter:escape.filter(deferred, ____int3rpr3t3r____) }}\
 {% endset %}\
-{{ filter:escape_jinjava.filter(__render_572171194_temp_variable__, null) }}
+{{ filter:escape_jinjava.filter(__render_524436216_temp_variable__, ____int3rpr3t3r____) }}
 
-{% set __render_572171194_temp_variable__ %}\
-Hi {{ filter:escape.filter(deferred, null) }}\
+{% set __render_524436216_temp_variable__ %}\
+Hi {{ filter:escape.filter(deferred, ____int3rpr3t3r____) }}\
 {% endset %}\
-{{ __render_572171194_temp_variable__ }}
+{{ __render_524436216_temp_variable__ }}
diff --git a/src/test/resources/eager/handles-double-import-modification/test.expected.jinja b/src/test/resources/eager/handles-double-import-modification/test.expected.jinja
@@ -9,7 +9,7 @@
 
 {% endif %}
 
-{% set foo = filter:join.filter([foo, 'b'], null, '') %}\
+{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_meta_import_alias_3016318__.update({'foo': foo}) %}
 {% do __temp_meta_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
@@ -28,7 +28,7 @@
 
 {% endif %}
 
-{% set foo = filter:join.filter([foo, 'b'], null, '') %}\
+{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\
 {% do __temp_meta_import_alias_3016319__.update({'foo': foo}) %}
 {% do __temp_meta_import_alias_3016319__.update({'foo': foo,'import_resource_path': 'eager/supplements/deferred-modification.jinja'}) %}\
 {% endfor %}\
diff --git a/src/test/resources/eager/handles-same-name-import-var/test.expected.jinja b/src/test/resources/eager/handles-same-name-import-var/test.expected.jinja
@@ -35,5 +35,5 @@
 {% set my_var = __temp_meta_import_alias_1059697132__ %}\
 {% set current_path,__temp_meta_current_path_944750549__ = __temp_meta_current_path_944750549__,null %}\
 {% enddo %}
-{{ filter:dictsort.filter(my_var, null, false, 'key') }}
+{{ filter:dictsort.filter(my_var, ____int3rpr3t3r____, false, 'key') }}
 {% endif %}
diff --git a/src/test/resources/eager/reconstructs-block-set-variables-in-for-loop/test.expected.jinja b/src/test/resources/eager/reconstructs-block-set-variables-in-for-loop/test.expected.jinja
@@ -2,5 +2,5 @@
 {% set __macro_foo_97643642_temp_variable_0__ %}
 {{ deferred }}
 {% endset %}\
-{{ filter:int.filter(__macro_foo_97643642_temp_variable_0__, null) + 3 }}
+{{ filter:int.filter(__macro_foo_97643642_temp_variable_0__, ____int3rpr3t3r____) + 3 }}
 {% endfor %}
diff --git a/src/test/resources/eager/reconstructs-fromed-macro/test.expected.jinja b/src/test/resources/eager/reconstructs-fromed-macro/test.expected.jinja
@@ -1,6 +1,6 @@
 {% set deferred_import_resource_path = 'eager/reconstructs-fromed-macro/has-macro.jinja' %}\
 {% macro to_upper(param) %}
- {{ filter:upper.filter(param, null) }}
+ {{ filter:upper.filter(param, ____int3rpr3t3r____) }}
 {% endmacro %}\
 {% set deferred_import_resource_path = null %}\
 {{ to_upper(deferred) }}
diff --git a/src/test/resources/eager/uses-unique-macro-names/test.expected.jinja b/src/test/resources/eager/uses-unique-macro-names/test.expected.jinja

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public AstNode createAstNode(AstNode... children) {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`protected AstNode interpreter() {`
`132`		`- return new AstNull();`
	`132`	`+ return identifier(INTERPRETER);`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ public void itPreservesUnresolvable() {`
`235`	`235`	`fail("Should throw DeferredParsingException");`
`236`	`236`	`} catch (DeferredParsingException e) {`
`237`	`237`	`assertThat(e.getDeferredEvalResult())`
`238`		`- .isEqualTo("filter:upper.filter(foo_object.deferred, null)");`
	`238`	`+ .isEqualTo("filter:upper.filter(foo_object.deferred, ____int3rpr3t3r____)");`
`239`	`239`	`}`
`240`	`240`	`}`
`241`	`241`	`}`