From aca9fd0d11a25cf2b5166d82267a315dd9c461a5 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Fri, 6 Sep 2024 18:12:17 -0400 Subject: [PATCH 1/3] Add ability to make eager test fixtures pretty --- .../jinjava/ExpectedTemplateInterpreter.java | 62 +++++++++++++++---- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java b/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java index 0694a47ac..4c1cc4b23 100644 --- a/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java +++ b/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java @@ -15,6 +15,7 @@ public class ExpectedTemplateInterpreter { private Jinjava jinjava; private JinjavaInterpreter interpreter; private String path; + private boolean sensibleCurrentPath = false; public ExpectedTemplateInterpreter( Jinjava jinjava, @@ -26,15 +27,35 @@ public ExpectedTemplateInterpreter( this.path = path; } + public static ExpectedTemplateInterpreter withSensibleCurrentPath( + Jinjava jinjava, + JinjavaInterpreter interpreter, + String path + ) { + return new ExpectedTemplateInterpreter(jinjava, interpreter, path, true); + } + + private ExpectedTemplateInterpreter( + Jinjava jinjava, + JinjavaInterpreter interpreter, + String path, + boolean sensibleCurrentPath + ) { + this.jinjava = jinjava; + this.interpreter = interpreter; + this.path = path; + this.sensibleCurrentPath = sensibleCurrentPath; + } + public String assertExpectedOutput(String name) { String template = getFixtureTemplate(name); String output = JinjavaInterpreter.getCurrent().render(template); assertThat(JinjavaInterpreter.getCurrent().getContext().getDeferredNodes()) .as("Ensure no deferred nodes were created") .isEmpty(); - assertThat(output.trim()).isEqualTo(expected(name).trim()); - assertThat(JinjavaInterpreter.getCurrent().render(output).trim()) - .isEqualTo(expected(name).trim()); + assertThat(prettify(output.trim())).isEqualTo(prettify(expected(name).trim())); + assertThat(prettify(JinjavaInterpreter.getCurrent().render(output).trim())) + .isEqualTo(prettify(expected(name).trim())); return output; } @@ -44,7 +65,7 @@ public String assertExpectedOutputNonIdempotent(String name) { assertThat(JinjavaInterpreter.getCurrent().getContext().getDeferredNodes()) .as("Ensure no deferred nodes were created") .isEmpty(); - assertThat(output.trim()).isEqualTo(expected(name).trim()); + assertThat(prettify(output.trim())).isEqualTo(prettify(expected(name).trim())); return output; } @@ -105,7 +126,7 @@ public String assertExpectedNonEagerOutput(String name) { assertThat(JinjavaInterpreter.getCurrent().getContext().getDeferredNodes()) .as("Ensure no deferred nodes were created") .isEmpty(); - assertThat(output.trim()).isEqualTo(expected(name).trim()); + assertThat(prettify(output.trim())).isEqualTo(prettify(expected(name).trim())); } } finally { JinjavaInterpreter.popCurrent(); @@ -114,11 +135,24 @@ public String assertExpectedNonEagerOutput(String name) { return output; } + private String prettify(String string) { + return string.replaceAll("([}%]})([^\\s])", "$1\\\\\n$2"); + } + public String getFixtureTemplate(String name) { try { - return Resources.toString( - Resources.getResource(String.format("%s/%s.jinja", path, name)), - StandardCharsets.UTF_8 + if (sensibleCurrentPath) { + JinjavaInterpreter + .getCurrent() + .getContext() + .getCurrentPathStack() + .push(String.format("%s/%s.jinja", path, name), 0, 0); + } + return simplify( + Resources.toString( + Resources.getResource(String.format("%s/%s.jinja", path, name)), + StandardCharsets.UTF_8 + ) ); } catch (IOException e) { throw new RuntimeException(e); @@ -127,15 +161,21 @@ public String getFixtureTemplate(String name) { private String expected(String name) { try { - return Resources.toString( - Resources.getResource(String.format("%s/%s.expected.jinja", path, name)), - StandardCharsets.UTF_8 + return simplify( + Resources.toString( + Resources.getResource(String.format("%s/%s.expected.jinja", path, name)), + StandardCharsets.UTF_8 + ) ); } catch (IOException e) { throw new RuntimeException(e); } } + private String simplify(String prettified) { + return prettified.replaceAll("\\\\\n\\s*", ""); + } + public String getDeferredFixtureTemplate(String templateLocation) { try { return Resources.toString( From 962c671f3a13b70a01b06ecc848893555c03a171 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Fri, 6 Sep 2024 18:21:16 -0400 Subject: [PATCH 2/3] Replace cramped test output with escaped newlines for better readability --- ...reference-to-get-overridden.expected.jinja | 16 ++-- ...meta-context-var-overriding.expected.jinja | 6 +- ...variable-sharing-alias-name.expected.jinja | 18 ++++- ...tag-when-partially-resolved.expected.jinja | 8 +- ...-defers-with-multiple-loops.expected.jinja | 3 +- ...-tag-with-deferred-argument.expected.jinja | 6 +- .../eager/defers-caller.expected.jinja | 3 +- ...s-within-deferred-set-block.expected.jinja | 8 +- ...op-setting-meta-context-var.expected.jinja | 16 +++- ...fers-macro-for-do-and-print.expected.jinja | 16 +++- .../defers-macro-in-expression.expected.jinja | 11 ++- .../eager/defers-macro-in-for.expected.jinja | 7 +- .../eager/defers-macro-in-if.expected.jinja | 7 +- .../defers-on-immutable-mode.expected.jinja | 9 ++- ...-import-modification-in-for.expected.jinja | 75 ++++++++++++++----- ...iable-in-set-in-wrong-scope.expected.jinja | 6 +- ...uct-variable-in-wrong-scope.expected.jinja | 12 ++- ...affect-parent-from-eager-if.expected.jinja | 3 +- ...e-append-in-deferred-if-tag.expected.jinja | 5 +- ...le-append-in-deferred-macro.expected.jinja | 9 ++- ...uble-append-in-deferred-set.expected.jinja | 6 +- .../doesnt-overwrite-elif.expected.jinja | 6 +- .../eager/eagerly-defers-macro.expected.jinja | 14 +++- ...fully-defers-filtered-macro.expected.jinja | 17 ++++- .../eager/handles-auto-escape.expected.jinja | 8 +- ...es-block-set-in-deferred-if.expected.jinja | 7 +- ...dles-clashing-name-in-macro.expected.jinja | 3 +- .../eager/handles-complex-raw.expected.jinja | 8 +- ...ndles-cycle-in-deferred-for.expected.jinja | 3 +- .../handles-deferred-cycle-as.expected.jinja | 19 ++++- ...red-for-loop-var-from-macro.expected.jinja | 9 ++- ...les-deferred-from-import-as.expected.jinja | 7 +- ...andles-deferred-import-vars.expected.jinja | 27 +++++-- ...ndles-deferred-in-ifchanged.expected.jinja | 6 +- ...ndles-deferred-in-namespace.expected.jinja | 6 +- ...rred-modification-in-caller.expected.jinja | 11 ++- ...les-deferring-loop-variable.expected.jinja | 9 ++- ...-double-import-modification.expected.jinja | 36 +++++++-- .../test.expected.jinja | 15 +++- .../test.expected.jinja | 4 +- ...cope-reference-modification.expected.jinja | 43 ++++++++--- ...ndles-import-in-deferred-if.expected.jinja | 21 +++++- ...ar-against-deferred-in-loop.expected.jinja | 13 +++- ...ication-when-source-is-lost.expected.jinja | 11 ++- ...andles-same-name-import-var.expected.jinja | 39 ++++++++-- ...les-set-and-modified-in-for.expected.jinja | 3 +- .../eager/handles-set-in-for.expected.jinja | 3 +- ...les-value-modified-in-macro.expected.jinja | 6 +- .../has-proper-line-stripping.expected.jinja | 7 +- ...acro-modifications-in-scope.expected.jinja | 41 ++++++++-- .../test.expected.jinja | 3 +- ...-variable-in-deferred-macro.expected.jinja | 12 ++- ...oop-item-on-current-context.expected.jinja | 6 +- ...epends-set-if-state-changes.expected.jinja | 3 +- ...w-inside-deferred-set-block.expected.jinja | 4 +- .../preserves-value-set-in-if.expected.jinja | 3 +- ...rred-fromed-macro-in-output.expected.jinja | 6 +- ...ed-imported-macro-in-output.expected.jinja | 6 +- .../reconstructs-aliased-macro.expected.jinja | 9 ++- .../test.expected.jinja | 21 ++++-- .../test.expected.jinja | 15 +++- ...k-set-variables-in-for-loop.expected.jinja | 3 +- ...eferred-variable-eventually.expected.jinja | 12 ++- .../reconstructs-map-node.expected.jinja | 11 ++- ...e-for-set-tags-using-period.expected.jinja | 8 +- ...ue-in-string-representation.expected.jinja | 29 +++++-- ...ariables-in-deferred-caller.expected.jinja | 6 +- ...-in-deferred-imported-macro.expected.jinja | 29 +++++-- ...structs-with-multiple-loops.expected.jinja | 4 +- ...m-inside-nested-expressions.expected.jinja | 4 +- ...fication-with-deferred-loop.expected.jinja | 3 +- .../eager/reverts-simple.expected.jinja | 3 +- ...-in-deferred-execution-mode.expected.jinja | 6 +- .../scopes-resetting-bindings.expected.jinja | 3 +- ...iple-vars-deferred-in-child.expected.jinja | 8 +- .../uses-unique-macro-names.expected.jinja | 14 +++- ...wraps-certain-output-in-raw.expected.jinja | 24 ++++-- ...fers-block-in-extends-child.expected.jinja | 10 ++- ...s-super-block-with-deferred.expected.jinja | 10 ++- ...ucts-deferred-outside-block.expected.jinja | 12 ++- ...es-nested-deferred-for-loop.expected.jinja | 9 ++- .../handles-only-deferred-elif.expected.jinja | 3 +- .../includes-deferred.expected.jinja | 6 +- 83 files changed, 729 insertions(+), 228 deletions(-) diff --git a/src/test/resources/eager/allows-deferred-lazy-reference-to-get-overridden.expected.jinja b/src/test/resources/eager/allows-deferred-lazy-reference-to-get-overridden.expected.jinja index de01abeb7..07854f3c5 100644 --- a/src/test/resources/eager/allows-deferred-lazy-reference-to-get-overridden.expected.jinja +++ b/src/test/resources/eager/allows-deferred-lazy-reference-to-get-overridden.expected.jinja @@ -1,6 +1,12 @@ -{% set a_list = ['a', 'b'] %}{% for __ignored__ in [0] %} -{% set b_list = a_list %}{% if deferred %} +{% set a_list = ['a', 'b'] %}\ +{% for __ignored__ in [0] %} +{% set b_list = a_list %}\ +{% if deferred %} {% set b_list = [deferred] %} -{% endif %}{% do b_list.append(deferred ? 'B' : '') %} -B: {{ b_list }}.{% endfor %}{% do a_list.append(deferred ? 'A' : '') %} -A: {{ a_list }}. +{% endif %}\ +{% do b_list.append(deferred ? 'B' : '') %} +B: {{ b_list }}\ +.{% endfor %}\ +{% do a_list.append(deferred ? 'A' : '') %} +A: {{ a_list }}\ +. diff --git a/src/test/resources/eager/allows-meta-context-var-overriding.expected.jinja b/src/test/resources/eager/allows-meta-context-var-overriding.expected.jinja index b9e48c43b..061a088d4 100644 --- a/src/test/resources/eager/allows-meta-context-var-overriding.expected.jinja +++ b/src/test/resources/eager/allows-meta-context-var-overriding.expected.jinja @@ -1,9 +1,11 @@ 0 META {% for meta in deferred %} -{{ meta }}{% endfor %} +{{ meta }}\ +{% endfor %} META -{% set meta = [] %}{% if deferred %} +{% set meta = [] %}\ +{% if deferred %} {% do meta.append(1) %} {% endif %} {{ meta }} diff --git a/src/test/resources/eager/allows-variable-sharing-alias-name.expected.jinja b/src/test/resources/eager/allows-variable-sharing-alias-name.expected.jinja index 470103a36..abe4a4a2e 100644 --- a/src/test/resources/eager/allows-variable-sharing-alias-name.expected.jinja +++ b/src/test/resources/eager/allows-variable-sharing-alias-name.expected.jinja @@ -1,7 +1,17 @@ -{% do %}{% set current_path = 'filters.jinja' %}{% set __temp_import_alias_854547461__ = {} %}{% for __ignored__ in [0] %} -{% set bar = deferred %}{% do __temp_import_alias_854547461__.update({'bar': bar}) %} +{% do %}\ +{% set current_path = 'filters.jinja' %}\ +{% set __temp_import_alias_854547461__ = {} %}\ +{% for __ignored__ in [0] %} +{% set bar = deferred %}\ +{% do __temp_import_alias_854547461__.update({'bar': bar}) %} -{% set filters = {} %}{% do __temp_import_alias_854547461__.update({'filters': filters}) %}{% do filters.update(deferred) %} -{% do __temp_import_alias_854547461__.update({'bar': bar,'foo': 123,'import_resource_path': 'filters.jinja','filters': filters}) %}{% endfor %}{% set filters = __temp_import_alias_854547461__ %}{% set current_path = '' %}{% enddo %} +{% set filters = {} %}\ +{% do __temp_import_alias_854547461__.update({'filters': filters}) %}\ +{% do filters.update(deferred) %} +{% do __temp_import_alias_854547461__.update({'bar': bar,'foo': 123,'import_resource_path': 'filters.jinja','filters': filters}) %}\ +{% endfor %}\ +{% set filters = __temp_import_alias_854547461__ %}\ +{% set current_path = '' %}\ +{% enddo %} {{ filters }} diff --git a/src/test/resources/eager/commits-variables-from-do-tag-when-partially-resolved.expected.jinja b/src/test/resources/eager/commits-variables-from-do-tag-when-partially-resolved.expected.jinja index 77b6f1ee9..804116b2a 100644 --- a/src/test/resources/eager/commits-variables-from-do-tag-when-partially-resolved.expected.jinja +++ b/src/test/resources/eager/commits-variables-from-do-tag-when-partially-resolved.expected.jinja @@ -1,7 +1,11 @@ -{% do %}{% set list1 = ['b'] %}{% set list0 = ['a'] %}{% set list2 = ['c'] %} +{% do %}\ +{% set list1 = ['b'] %}\ +{% set list0 = ['a'] %}\ +{% set list2 = ['c'] %} -{% set list2 = ['c'] %}{% do list2.append(deferred) %} +{% set list2 = ['c'] %}\ +{% do list2.append(deferred) %} {% unless deferred %} {% set list0 = ['a', 'a'] %} {% endunless %} diff --git a/src/test/resources/eager/correctly-defers-with-multiple-loops.expected.jinja b/src/test/resources/eager/correctly-defers-with-multiple-loops.expected.jinja index 06e64b7fd..7d11ac0a1 100644 --- a/src/test/resources/eager/correctly-defers-with-multiple-loops.expected.jinja +++ b/src/test/resources/eager/correctly-defers-with-multiple-loops.expected.jinja @@ -1,4 +1,5 @@ -{% set my_list = [] %}{% for __ignored__ in [0] %} +{% set my_list = [] %}\ +{% for __ignored__ in [0] %} {% for j in deferred %} {% do my_list.append(0) %} {% endfor %} diff --git a/src/test/resources/eager/defers-call-tag-with-deferred-argument.expected.jinja b/src/test/resources/eager/defers-call-tag-with-deferred-argument.expected.jinja index ddac4cae9..4a4a1459f 100644 --- a/src/test/resources/eager/defers-call-tag-with-deferred-argument.expected.jinja +++ b/src/test/resources/eager/defers-call-tag-with-deferred-argument.expected.jinja @@ -1,12 +1,14 @@ {% macro repeat(val) %} {{ val }} {{ caller() }} -{% endmacro %}{% call repeat(deferred) %} +{% endmacro %}\ +{% call repeat(deferred) %} macro 1 {% macro repeat(val) %} {{ val }} {{ caller() }} -{% endmacro %}{% call repeat(deferred + 1) %} +{% endmacro %}\ +{% call repeat(deferred + 1) %} macro2 {% endcall %} {% endcall %} diff --git a/src/test/resources/eager/defers-caller.expected.jinja b/src/test/resources/eager/defers-caller.expected.jinja index d69bbc924..27f605f5b 100644 --- a/src/test/resources/eager/defers-caller.expected.jinja +++ b/src/test/resources/eager/defers-caller.expected.jinja @@ -1,2 +1,3 @@ Jack says: -How do I get a {{ deferred }}? +How do I get a {{ deferred }}\ +? diff --git a/src/test/resources/eager/defers-changes-within-deferred-set-block.expected.jinja b/src/test/resources/eager/defers-changes-within-deferred-set-block.expected.jinja index 89eba8d37..1ba5b9f04 100644 --- a/src/test/resources/eager/defers-changes-within-deferred-set-block.expected.jinja +++ b/src/test/resources/eager/defers-changes-within-deferred-set-block.expected.jinja @@ -1,6 +1,10 @@ 1 -{% set bar = [1] %}{% set foo = '1' %}{% if deferred %} -{% set foo %}2{% do bar.append(2) %}{% endset %} +{% set bar = [1] %}\ +{% set foo = '1' %}\ +{% if deferred %} +{% set foo %}\ +2{% do bar.append(2) %}\ +{% endset %} {% endif %} Bar: {{ bar }} Foo: {{ foo }} diff --git a/src/test/resources/eager/defers-loop-setting-meta-context-var.expected.jinja b/src/test/resources/eager/defers-loop-setting-meta-context-var.expected.jinja index 60080c95e..33c36f300 100644 --- a/src/test/resources/eager/defers-loop-setting-meta-context-var.expected.jinja +++ b/src/test/resources/eager/defers-loop-setting-meta-context-var.expected.jinja @@ -1,5 +1,17 @@ {% for __ignored__ in [0] %} -{% macro render(content, query) %}{% if query %}{{ content.foo }}{% endif %}{% endmacro %}{% set content = {'foo': 'a'} %}{{ render(content, deferred) }} +{% macro render(content, query) %}\ +{% if query %}\ +{{ content.foo }}\ +{% endif %}\ +{% endmacro %}\ +{% set content = {'foo': 'a'} %}\ +{{ render(content, deferred) }} -{% macro render(content, query) %}{% if query %}{{ content.foo }}{% endif %}{% endmacro %}{% set content = {'foo': 'b'} %}{{ render(content, deferred) }} +{% macro render(content, query) %}\ +{% if query %}\ +{{ content.foo }}\ +{% endif %}\ +{% endmacro %}\ +{% set content = {'foo': 'b'} %}\ +{{ render(content, deferred) }} {% endfor %} diff --git a/src/test/resources/eager/defers-macro-for-do-and-print.expected.jinja b/src/test/resources/eager/defers-macro-for-do-and-print.expected.jinja index 5fda61c3b..7bc44be6f 100644 --- a/src/test/resources/eager/defers-macro-for-do-and-print.expected.jinja +++ b/src/test/resources/eager/defers-macro-for-do-and-print.expected.jinja @@ -1,5 +1,15 @@ Is ([]), Macro: [10] -Is ([10]),{% set my_list = [10] %}{% macro macro_append(num) %}{% do my_list.append(num) %}Macro: {{ my_list }}{% endmacro %}{% do macro_append(deferred) %} -Is ({{ my_list }}), -{% macro macro_append(num) %}{% do my_list.append(num) %}Macro: {{ my_list }}{% endmacro %}{% print macro_append(deferred2) %} +Is ([10]),{% set my_list = [10] %}\ +{% macro macro_append(num) %}\ +{% do my_list.append(num) %}\ +Macro: {{ my_list }}\ +{% endmacro %}\ +{% do macro_append(deferred) %} +Is ({{ my_list }}\ +), +{% macro macro_append(num) %}\ +{% do my_list.append(num) %}\ +Macro: {{ my_list }}\ +{% endmacro %}\ +{% print macro_append(deferred2) %} diff --git a/src/test/resources/eager/defers-macro-in-expression.expected.jinja b/src/test/resources/eager/defers-macro-in-expression.expected.jinja index 96f2afbbc..7443a94eb 100644 --- a/src/test/resources/eager/defers-macro-in-expression.expected.jinja +++ b/src/test/resources/eager/defers-macro-in-expression.expected.jinja @@ -1,3 +1,10 @@ 2 -{% macro plus(foo, add) %}{{ foo + (filter:int.filter(add, ____int3rpr3t3r____)) }}{% endmacro %}{{ plus(deferred, 1.1) }}{% set deferred = deferred + 2 %} -{% macro plus(foo, add) %}{{ foo + (filter:int.filter(add, ____int3rpr3t3r____)) }}{% endmacro %}{{ plus(deferred, 3.1) }} \ No newline at end of file +{% macro plus(foo, add) %}\ +{{ foo + (filter:int.filter(add, ____int3rpr3t3r____)) }}\ +{% endmacro %}\ +{{ plus(deferred, 1.1) }}\ +{% set deferred = deferred + 2 %} +{% macro plus(foo, add) %}\ +{{ foo + (filter:int.filter(add, ____int3rpr3t3r____)) }}\ +{% endmacro %}\ +{{ plus(deferred, 3.1) }} \ No newline at end of file diff --git a/src/test/resources/eager/defers-macro-in-for.expected.jinja b/src/test/resources/eager/defers-macro-in-for.expected.jinja index 16d63d7bc..3311b8714 100644 --- a/src/test/resources/eager/defers-macro-in-for.expected.jinja +++ b/src/test/resources/eager/defers-macro-in-for.expected.jinja @@ -1,3 +1,8 @@ -{% set my_list = [] %}{% macro macro_append(num) %}{% do my_list.append(num) %}{{ my_list }}{% endmacro %}{% for item in filter:split.filter(macro_append(deferred), ____int3rpr3t3r____, ',', 2) %} +{% set my_list = [] %}\ +{% macro macro_append(num) %}\ +{% do my_list.append(num) %}\ +{{ my_list }}\ +{% endmacro %}\ +{% for item in filter:split.filter(macro_append(deferred), ____int3rpr3t3r____, ',', 2) %} {{ item }} {% endfor %} diff --git a/src/test/resources/eager/defers-macro-in-if.expected.jinja b/src/test/resources/eager/defers-macro-in-if.expected.jinja index f2cdabecb..67f28d9e4 100644 --- a/src/test/resources/eager/defers-macro-in-if.expected.jinja +++ b/src/test/resources/eager/defers-macro-in-if.expected.jinja @@ -1,3 +1,8 @@ -{% set my_list = [] %}{% macro macro_append(num) %}{% do my_list.append(num) %}{{ my_list }}{% endmacro %}{% if [] == filter:split.filter(macro_append(deferred), ____int3rpr3t3r____, ',', 2) %} +{% set my_list = [] %}\ +{% macro macro_append(num) %}\ +{% do my_list.append(num) %}\ +{{ my_list }}\ +{% endmacro %}\ +{% if [] == filter:split.filter(macro_append(deferred), ____int3rpr3t3r____, ',', 2) %} {{ my_list }} {% endif %} diff --git a/src/test/resources/eager/defers-on-immutable-mode.expected.jinja b/src/test/resources/eager/defers-on-immutable-mode.expected.jinja index 47f89f0c6..21cb364d5 100644 --- a/src/test/resources/eager/defers-on-immutable-mode.expected.jinja +++ b/src/test/resources/eager/defers-on-immutable-mode.expected.jinja @@ -1,10 +1,13 @@ -{% set foo = 1 %}{% if deferred %} +{% set foo = 1 %}\ +{% if deferred %} {% set foo = 2 %} {% else %} {% set foo = 3 %} {% endif %} {{ foo }} -{% for __ignored__ in [0] %}{% set bar = 1 + deferred %} +{% for __ignored__ in [0] %}\ +{% set bar = 1 + deferred %} {% set bar = bar + deferred %} -{% endfor %}1 +{% endfor %}\ +1 diff --git a/src/test/resources/eager/does-not-override-import-modification-in-for.expected.jinja b/src/test/resources/eager/does-not-override-import-modification-in-for.expected.jinja index 6f6e2f083..1881836c0 100644 --- a/src/test/resources/eager/does-not-override-import-modification-in-for.expected.jinja +++ b/src/test/resources/eager/does-not-override-import-modification-in-for.expected.jinja @@ -1,40 +1,81 @@ -{% set foo = 'start' %}{% for __ignored__ in [0] %} -{% do %}{% set current_path = 'deferred-modification.jinja' %}{% set __temp_import_alias_3016318__ = {} %}{% for __ignored__ in [0] %}{% if deferred %} +{% set foo = 'start' %}\ +{% for __ignored__ in [0] %} +{% do %}\ +{% set current_path = 'deferred-modification.jinja' %}\ +{% set __temp_import_alias_3016318__ = {} %}\ +{% for __ignored__ in [0] %}\ +{% if deferred %} -{% set foo = 'starta' %}{% do __temp_import_alias_3016318__.update({'foo': foo}) %} +{% set foo = 'starta' %}\ +{% do __temp_import_alias_3016318__.update({'foo': foo}) %} {% endif %} -{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}{% do __temp_import_alias_3016318__.update({'foo': foo}) %} -{% do __temp_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'deferred-modification.jinja'}) %}{% endfor %}{% set bar1 = __temp_import_alias_3016318__ %}{% set current_path = '' %}{% enddo %} +{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\ +{% do __temp_import_alias_3016318__.update({'foo': foo}) %} +{% do __temp_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'deferred-modification.jinja'}) %}\ +{% endfor %}\ +{% set bar1 = __temp_import_alias_3016318__ %}\ +{% set current_path = '' %}\ +{% enddo %} {{ bar1.foo }} -{% do %}{% set current_path = 'deferred-modification.jinja' %}{% set __temp_import_alias_3016319__ = {} %}{% for __ignored__ in [0] %}{% if deferred %} +{% do %}\ +{% set current_path = 'deferred-modification.jinja' %}\ +{% set __temp_import_alias_3016319__ = {} %}\ +{% for __ignored__ in [0] %}\ +{% if deferred %} -{% set foo = filter:join.filter([foo, 'a'], ____int3rpr3t3r____, '') %}{% do __temp_import_alias_3016319__.update({'foo': foo}) %} +{% set foo = filter:join.filter([foo, 'a'], ____int3rpr3t3r____, '') %}\ +{% do __temp_import_alias_3016319__.update({'foo': foo}) %} {% endif %} -{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}{% do __temp_import_alias_3016319__.update({'foo': foo}) %} -{% do __temp_import_alias_3016319__.update({'import_resource_path': 'deferred-modification.jinja'}) %}{% endfor %}{% set bar2 = __temp_import_alias_3016319__ %}{% set current_path = '' %}{% enddo %} +{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\ +{% do __temp_import_alias_3016319__.update({'foo': foo}) %} +{% do __temp_import_alias_3016319__.update({'import_resource_path': 'deferred-modification.jinja'}) %}\ +{% endfor %}\ +{% set bar2 = __temp_import_alias_3016319__ %}\ +{% set current_path = '' %}\ +{% enddo %} {{ bar2.foo }} -{% do %}{% set current_path = 'deferred-modification.jinja' %}{% set __temp_import_alias_3016318__ = {} %}{% for __ignored__ in [0] %}{% if deferred %} +{% do %}\ +{% set current_path = 'deferred-modification.jinja' %}\ +{% set __temp_import_alias_3016318__ = {} %}\ +{% for __ignored__ in [0] %}\ +{% if deferred %} -{% set foo = filter:join.filter([foo, 'a'], ____int3rpr3t3r____, '') %}{% do __temp_import_alias_3016318__.update({'foo': foo}) %} +{% set foo = filter:join.filter([foo, 'a'], ____int3rpr3t3r____, '') %}\ +{% do __temp_import_alias_3016318__.update({'foo': foo}) %} {% endif %} -{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}{% do __temp_import_alias_3016318__.update({'foo': foo}) %} -{% do __temp_import_alias_3016318__.update({'import_resource_path': 'deferred-modification.jinja'}) %}{% endfor %}{% set bar1 = __temp_import_alias_3016318__ %}{% set current_path = '' %}{% enddo %} +{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\ +{% do __temp_import_alias_3016318__.update({'foo': foo}) %} +{% do __temp_import_alias_3016318__.update({'import_resource_path': 'deferred-modification.jinja'}) %}\ +{% endfor %}\ +{% set bar1 = __temp_import_alias_3016318__ %}\ +{% set current_path = '' %}\ +{% enddo %} {{ bar1.foo }} -{% do %}{% set current_path = 'deferred-modification.jinja' %}{% set __temp_import_alias_3016319__ = {} %}{% for __ignored__ in [0] %}{% if deferred %} +{% do %}\ +{% set current_path = 'deferred-modification.jinja' %}\ +{% set __temp_import_alias_3016319__ = {} %}\ +{% for __ignored__ in [0] %}\ +{% if deferred %} -{% set foo = filter:join.filter([foo, 'a'], ____int3rpr3t3r____, '') %}{% do __temp_import_alias_3016319__.update({'foo': foo}) %} +{% set foo = filter:join.filter([foo, 'a'], ____int3rpr3t3r____, '') %}\ +{% do __temp_import_alias_3016319__.update({'foo': foo}) %} {% endif %} -{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}{% do __temp_import_alias_3016319__.update({'foo': foo}) %} -{% do __temp_import_alias_3016319__.update({'import_resource_path': 'deferred-modification.jinja'}) %}{% endfor %}{% set bar2 = __temp_import_alias_3016319__ %}{% set current_path = '' %}{% enddo %} +{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\ +{% do __temp_import_alias_3016319__.update({'foo': foo}) %} +{% do __temp_import_alias_3016319__.update({'import_resource_path': 'deferred-modification.jinja'}) %}\ +{% endfor %}\ +{% set bar2 = __temp_import_alias_3016319__ %}\ +{% set current_path = '' %}\ +{% enddo %} {{ bar2.foo }} {% endfor %} {{ foo }} diff --git a/src/test/resources/eager/does-not-reconstruct-variable-in-set-in-wrong-scope.expected.jinja b/src/test/resources/eager/does-not-reconstruct-variable-in-set-in-wrong-scope.expected.jinja index 991fe8116..44ebdcc44 100644 --- a/src/test/resources/eager/does-not-reconstruct-variable-in-set-in-wrong-scope.expected.jinja +++ b/src/test/resources/eager/does-not-reconstruct-variable-in-set-in-wrong-scope.expected.jinja @@ -1,4 +1,6 @@ -{% set my_list = [] %}{% set foo %} -{% do my_list.append(deferred) %}a +{% set my_list = [] %}\ +{% set foo %} +{% do my_list.append(deferred) %}\ +a {% endset %} {{ my_list }} \ No newline at end of file diff --git a/src/test/resources/eager/does-not-reconstruct-variable-in-wrong-scope.expected.jinja b/src/test/resources/eager/does-not-reconstruct-variable-in-wrong-scope.expected.jinja index cb6121e3a..5fe8a8f32 100644 --- a/src/test/resources/eager/does-not-reconstruct-variable-in-wrong-scope.expected.jinja +++ b/src/test/resources/eager/does-not-reconstruct-variable-in-wrong-scope.expected.jinja @@ -1,12 +1,16 @@ -{% set my_list = ['a'] %}{% if deferred %} +{% set my_list = ['a'] %}\ +{% if deferred %} {% set __macro_append_stuff_153654787_temp_variable_0__ %} {% set __macro_foo_97643642_temp_variable_1__ %} {% do my_list.append('b') %} -{% endset %}{{ __macro_foo_97643642_temp_variable_1__ }} +{% endset %}\ +{{ __macro_foo_97643642_temp_variable_1__ }} {% set __macro_foo_97643642_temp_variable_2__ %} {% do my_list.append('c') %} -{% endset %}{{ __macro_foo_97643642_temp_variable_2__ }} -{% endset %}{{ __macro_append_stuff_153654787_temp_variable_0__ }} +{% endset %}\ +{{ __macro_foo_97643642_temp_variable_2__ }} +{% endset %}\ +{{ __macro_append_stuff_153654787_temp_variable_0__ }} {% endif %} {% do my_list.append('d') %} diff --git a/src/test/resources/eager/doesnt-affect-parent-from-eager-if.expected.jinja b/src/test/resources/eager/doesnt-affect-parent-from-eager-if.expected.jinja index 8d3828801..5a91d037a 100644 --- a/src/test/resources/eager/doesnt-affect-parent-from-eager-if.expected.jinja +++ b/src/test/resources/eager/doesnt-affect-parent-from-eager-if.expected.jinja @@ -1,4 +1,5 @@ -{% set foo = 1 %}{% if deferred %} +{% set foo = 1 %}\ +{% if deferred %} {% set foo = 2 %} {% else %} {% set foo = 3 %} diff --git a/src/test/resources/eager/doesnt-double-append-in-deferred-if-tag.expected.jinja b/src/test/resources/eager/doesnt-double-append-in-deferred-if-tag.expected.jinja index 3e9054c04..818d51cd0 100644 --- a/src/test/resources/eager/doesnt-double-append-in-deferred-if-tag.expected.jinja +++ b/src/test/resources/eager/doesnt-double-append-in-deferred-if-tag.expected.jinja @@ -1,8 +1,9 @@ -{% set foo = [0, 1] %}{% if deferred == true %} +{% set foo = [0, 1] %}\ +{% if deferred == true %} [0, 1] {% do foo.append(2) %} {% else %} [0, 1] {% do foo.append(3) %} {% endif %} -{{ foo }} \ No newline at end of file +{{ foo }} diff --git a/src/test/resources/eager/doesnt-double-append-in-deferred-macro.expected.jinja b/src/test/resources/eager/doesnt-double-append-in-deferred-macro.expected.jinja index 52afb227a..383a93c39 100644 --- a/src/test/resources/eager/doesnt-double-append-in-deferred-macro.expected.jinja +++ b/src/test/resources/eager/doesnt-double-append-in-deferred-macro.expected.jinja @@ -1,7 +1,10 @@ -{% set my_list = ['a'] %}{% set __macro_foo_97643642_temp_variable_0__ %} +{% set my_list = ['a'] %}\ +{% set __macro_foo_97643642_temp_variable_0__ %} a {% if deferred %} -{% do my_list.append('b') %}b +{% do my_list.append('b') %}\ +b {% endif %} -{% endset %}{{ __macro_foo_97643642_temp_variable_0__ }} +{% endset %}\ +{{ __macro_foo_97643642_temp_variable_0__ }} {{ my_list }} diff --git a/src/test/resources/eager/doesnt-double-append-in-deferred-set.expected.jinja b/src/test/resources/eager/doesnt-double-append-in-deferred-set.expected.jinja index 34d90a9ea..36932e628 100644 --- a/src/test/resources/eager/doesnt-double-append-in-deferred-set.expected.jinja +++ b/src/test/resources/eager/doesnt-double-append-in-deferred-set.expected.jinja @@ -1,7 +1,9 @@ -{% set my_list = ['a'] %}{% set foo %} +{% set my_list = ['a'] %}\ +{% set foo %} a {% if deferred %} -{% do my_list.append('b') %}b +{% do my_list.append('b') %}\ +b {% endif %} {% endset %} {{ my_list }} diff --git a/src/test/resources/eager/doesnt-overwrite-elif.expected.jinja b/src/test/resources/eager/doesnt-overwrite-elif.expected.jinja index 0d301c30e..bf6893d6a 100644 --- a/src/test/resources/eager/doesnt-overwrite-elif.expected.jinja +++ b/src/test/resources/eager/doesnt-overwrite-elif.expected.jinja @@ -1,2 +1,6 @@ -{% set foo = [0] %}{% if false %}{% elif deferred && foo.append(1) %}1{% elif deferred && foo.append(2) %}2{% endif %} +{% set foo = [0] %}\ +{% if false %}\ +{% elif deferred && foo.append(1) %}\ +1{% elif deferred && foo.append(2) %}\ +2{% endif %} {{ foo }} diff --git a/src/test/resources/eager/eagerly-defers-macro.expected.jinja b/src/test/resources/eager/eagerly-defers-macro.expected.jinja index 529762396..d8dc2cff7 100644 --- a/src/test/resources/eager/eagerly-defers-macro.expected.jinja +++ b/src/test/resources/eager/eagerly-defers-macro.expected.jinja @@ -1,6 +1,12 @@ {% set __macro_big_guy_1311704000_temp_variable_0__ %} -{% if deferred %}I am foo{% else %}I am bar{% endif %} -{% endset %}{% print __macro_big_guy_1311704000_temp_variable_0__ %} +{% if deferred %}\ +I am foo{% else %}\ +I am bar{% endif %} +{% endset %}\ +{% print __macro_big_guy_1311704000_temp_variable_0__ %} {% set __macro_big_guy_1311704000_temp_variable_1__ %} -{% if deferred %}No more foo{% else %}I am bar{% endif %} -{% endset %}{% print __macro_big_guy_1311704000_temp_variable_1__ %} +{% if deferred %}\ +No more foo{% else %}\ +I am bar{% endif %} +{% endset %}\ +{% print __macro_big_guy_1311704000_temp_variable_1__ %} diff --git a/src/test/resources/eager/fully-defers-filtered-macro.expected.jinja b/src/test/resources/eager/fully-defers-filtered-macro.expected.jinja index 6eff41e08..4938403bd 100644 --- a/src/test/resources/eager/fully-defers-filtered-macro.expected.jinja +++ b/src/test/resources/eager/fully-defers-filtered-macro.expected.jinja @@ -1,6 +1,15 @@ -{% macro flashy(foo) %}{{ filter:upper.filter(foo, ____int3rpr3t3r____) }} - A flashy {{ deferred }}.{% endmacro %}{% set __macro_flashy_1625622909_temp_variable_0__ %}BAR - A flashy {{ deferred }}.{% endset %}{{ flashy(__macro_flashy_1625622909_temp_variable_0__) }} +{% macro flashy(foo) %}\ +{{ filter:upper.filter(foo, ____int3rpr3t3r____) }} + A flashy {{ deferred }}\ +.{% endmacro %}\ +{% set __macro_flashy_1625622909_temp_variable_0__ %}\ +BAR + A flashy {{ deferred }}\ +.{% endset %}\ +{{ flashy(__macro_flashy_1625622909_temp_variable_0__) }} --- -{% set __macro_silly_2092874071_temp_variable_0__ %}A silly {{ deferred }}.{% endset %}{{ filter:upper.filter(__macro_silly_2092874071_temp_variable_0__, ____int3rpr3t3r____) }} \ No newline at end of file +{% set __macro_silly_2092874071_temp_variable_0__ %}\ +A silly {{ deferred }}\ +.{% endset %}\ +{{ filter:upper.filter(__macro_silly_2092874071_temp_variable_0__, ____int3rpr3t3r____) }} \ No newline at end of file diff --git a/src/test/resources/eager/handles-auto-escape.expected.jinja b/src/test/resources/eager/handles-auto-escape.expected.jinja index a74c0de08..7c2796908 100644 --- a/src/test/resources/eager/handles-auto-escape.expected.jinja +++ b/src/test/resources/eager/handles-auto-escape.expected.jinja @@ -1,4 +1,8 @@ 1. foo < bar (Only expression nodes get escaped currently) -2. {% autoescape %}{% print deferred %}{% endautoescape %} +2. {% autoescape %}\ +{% print deferred %}\ +{% endautoescape %} 3. foo < bar -4. {% autoescape %}{{ deferred }}{% endautoescape %} +4. {% autoescape %}\ +{{ deferred }}\ +{% endautoescape %} diff --git a/src/test/resources/eager/handles-block-set-in-deferred-if.expected.jinja b/src/test/resources/eager/handles-block-set-in-deferred-if.expected.jinja index c0b628f7e..56b32565b 100644 --- a/src/test/resources/eager/handles-block-set-in-deferred-if.expected.jinja +++ b/src/test/resources/eager/handles-block-set-in-deferred-if.expected.jinja @@ -1,4 +1,7 @@ -{% set foo = 'empty' %}{% if deferred %} -{% set foo %}i am iron man{% endset %}{% set foo = 'I AM IRON MAN' %} +{% set foo = 'empty' %}\ +{% if deferred %} +{% set foo %}\ +i am iron man{% endset %}\ +{% set foo = 'I AM IRON MAN' %} {% endif %} {{ foo }} diff --git a/src/test/resources/eager/handles-clashing-name-in-macro.expected.jinja b/src/test/resources/eager/handles-clashing-name-in-macro.expected.jinja index 7c376088d..b018fdabe 100644 --- a/src/test/resources/eager/handles-clashing-name-in-macro.expected.jinja +++ b/src/test/resources/eager/handles-clashing-name-in-macro.expected.jinja @@ -1,4 +1,5 @@ {% macro func(foo) %} {{ foo }} -{% endmacro %}{{ func(foo=deferred) }} +{% endmacro %}\ +{{ func(foo=deferred) }} 1 diff --git a/src/test/resources/eager/handles-complex-raw.expected.jinja b/src/test/resources/eager/handles-complex-raw.expected.jinja index f7fb82e5b..5b922a92f 100644 --- a/src/test/resources/eager/handles-complex-raw.expected.jinja +++ b/src/test/resources/eager/handles-complex-raw.expected.jinja @@ -1,4 +1,8 @@ 1 -{% raw %}{{ 2 }}{% endraw %} +{% raw %}\ +{{ 2 }}\ +{% endraw %} 3 -{% raw %}{{ 4 }}{% endraw %} +{% raw %}\ +{{ 4 }}\ +{% endraw %} diff --git a/src/test/resources/eager/handles-cycle-in-deferred-for.expected.jinja b/src/test/resources/eager/handles-cycle-in-deferred-for.expected.jinja index 6570d194a..f5289ebf5 100644 --- a/src/test/resources/eager/handles-cycle-in-deferred-for.expected.jinja +++ b/src/test/resources/eager/handles-cycle-in-deferred-for.expected.jinja @@ -1,3 +1,4 @@ {% for item in deferred %} {% cycle '1','2','3' %} -{% cycle '1','2','3' %}{% endfor %} +{% cycle '1','2','3' %}\ +{% endfor %} diff --git a/src/test/resources/eager/handles-deferred-cycle-as.expected.jinja b/src/test/resources/eager/handles-deferred-cycle-as.expected.jinja index 55937f1c5..5893e2ee2 100644 --- a/src/test/resources/eager/handles-deferred-cycle-as.expected.jinja +++ b/src/test/resources/eager/handles-deferred-cycle-as.expected.jinja @@ -1,7 +1,20 @@ {% for __ignored__ in [0] %} {% set c = [1, deferred] %} -{% if exptest:iterable.evaluate(c, ____int3rpr3t3r____) %}{{ c[0 % filter:length.filter(c, ____int3rpr3t3r____)] }}{% else %}{{ c }}{% endif %} +{% if exptest:iterable.evaluate(c, ____int3rpr3t3r____) %}\ +{{ c[0 % filter:length.filter(c, ____int3rpr3t3r____)] }}\ +{% else %}\ +{{ c }}\ +{% endif %} {% set c = [2, deferred] %} -{% if exptest:iterable.evaluate(c, ____int3rpr3t3r____) %}{{ c[1 % filter:length.filter(c, ____int3rpr3t3r____)] }}{% else %}{{ c }}{% endif %} +{% if exptest:iterable.evaluate(c, ____int3rpr3t3r____) %}\ +{{ c[1 % filter:length.filter(c, ____int3rpr3t3r____)] }}\ +{% else %}\ +{{ c }}\ +{% endif %} {% set c = [3, deferred] %} -{% if exptest:iterable.evaluate(c, ____int3rpr3t3r____) %}{{ c[2 % filter:length.filter(c, ____int3rpr3t3r____)] }}{% else %}{{ c }}{% endif %}{% endfor %} +{% if exptest:iterable.evaluate(c, ____int3rpr3t3r____) %}\ +{{ c[2 % filter:length.filter(c, ____int3rpr3t3r____)] }}\ +{% else %}\ +{{ c }}\ +{% endif %}\ +{% endfor %} diff --git a/src/test/resources/eager/handles-deferred-for-loop-var-from-macro.expected.jinja b/src/test/resources/eager/handles-deferred-for-loop-var-from-macro.expected.jinja index 9c50b1240..54d9fc69a 100644 --- a/src/test/resources/eager/handles-deferred-for-loop-var-from-macro.expected.jinja +++ b/src/test/resources/eager/handles-deferred-for-loop-var-from-macro.expected.jinja @@ -4,10 +4,13 @@ {% for __ignored__ in [0] %} {% set __macro_doIt_1327224118_temp_variable_0__ %} {{ deferred ~ '{\"a\":\"a\"}' }} -{% endset %}{{ filter:upper.filter(__macro_doIt_1327224118_temp_variable_0__, ____int3rpr3t3r____) }} +{% endset %}\ +{{ 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__, ____int3rpr3t3r____) }} +{% endset %}\ +{{ filter:upper.filter(__macro_doIt_1327224118_temp_variable_1__, ____int3rpr3t3r____) }} {% endfor %} -{% endset %}{{ filter:upper.filter(__macro_getData_357124436_temp_variable_0__, ____int3rpr3t3r____) }} +{% endset %}\ +{{ filter:upper.filter(__macro_getData_357124436_temp_variable_0__, ____int3rpr3t3r____) }} diff --git a/src/test/resources/eager/handles-deferred-from-import-as.expected.jinja b/src/test/resources/eager/handles-deferred-from-import-as.expected.jinja index 8a4df6f1e..6ac262b61 100644 --- a/src/test/resources/eager/handles-deferred-from-import-as.expected.jinja +++ b/src/test/resources/eager/handles-deferred-from-import-as.expected.jinja @@ -1,5 +1,8 @@ -{% set myname = deferred + 7 %}{% do %} +{% set myname = deferred + 7 %}\ +{% do %} {% set bar = myname + 19 %} Hello {{ myname }} -{% set from_bar = bar %}{% enddo %}from_foo: Hello {{ myname }} +{% set from_bar = bar %}\ +{% enddo %}\ +from_foo: Hello {{ myname }} from_bar: {{ from_bar }} diff --git a/src/test/resources/eager/handles-deferred-import-vars.expected.jinja b/src/test/resources/eager/handles-deferred-import-vars.expected.jinja index 5f59e3cbc..b0c1d90af 100644 --- a/src/test/resources/eager/handles-deferred-import-vars.expected.jinja +++ b/src/test/resources/eager/handles-deferred-import-vars.expected.jinja @@ -1,11 +1,28 @@ -{% set myname = deferred + 3 %}{% do %} +{% set myname = deferred + 3 %}\ +{% do %} {% set bar = myname + 19 %} Hello {{ myname }} -{% enddo %}foo: Hello {{ myname }} +{% enddo %}\ +foo: Hello {{ myname }} bar: {{ bar }} --- -{% set myname = deferred + 7 %}{% do %}{% set current_path = 'macro-and-set.jinja' %}{% set __temp_import_alias_902286926__ = {} %}{% for __ignored__ in [0] %} -{% set bar = myname + 19 %}{% do __temp_import_alias_902286926__.update({'bar': bar}) %} +{% set myname = deferred + 7 %}\ +{% do %}\ +{% set current_path = 'macro-and-set.jinja' %}\ +{% set __temp_import_alias_902286926__ = {} %}\ +{% for __ignored__ in [0] %} +{% set bar = myname + 19 %}\ +{% do __temp_import_alias_902286926__.update({'bar': bar}) %} Hello {{ myname }} -{% do __temp_import_alias_902286926__.update({'import_resource_path': 'macro-and-set.jinja'}) %}{% endfor %}{% set simple = __temp_import_alias_902286926__ %}{% set current_path = '' %}{% enddo %}simple.foo: {% set deferred_import_resource_path = 'macro-and-set.jinja' %}{% macro simple.foo() %}Hello {{ myname }}{% endmacro %}{% set deferred_import_resource_path = null %}{{ simple.foo() }} +{% do __temp_import_alias_902286926__.update({'import_resource_path': 'macro-and-set.jinja'}) %}\ +{% endfor %}\ +{% set simple = __temp_import_alias_902286926__ %}\ +{% set current_path = '' %}\ +{% enddo %}\ +simple.foo: {% set deferred_import_resource_path = 'macro-and-set.jinja' %}\ +{% macro simple.foo() %}\ +Hello {{ myname }}\ +{% endmacro %}\ +{% set deferred_import_resource_path = null %}\ +{{ simple.foo() }} simple.bar: {{ simple.bar }} diff --git a/src/test/resources/eager/handles-deferred-in-ifchanged.expected.jinja b/src/test/resources/eager/handles-deferred-in-ifchanged.expected.jinja index fa2d2883a..c7fc38922 100644 --- a/src/test/resources/eager/handles-deferred-in-ifchanged.expected.jinja +++ b/src/test/resources/eager/handles-deferred-in-ifchanged.expected.jinja @@ -1 +1,5 @@ -{% for __ignored__ in [0] %}{{ deferred[1] }}{{ deferred[2] }}{{ deferred[1] }}{% endfor %} +{% for __ignored__ in [0] %}\ +{{ deferred[1] }}\ +{{ deferred[2] }}\ +{{ deferred[1] }}\ +{% endfor %} diff --git a/src/test/resources/eager/handles-deferred-in-namespace.expected.jinja b/src/test/resources/eager/handles-deferred-in-namespace.expected.jinja index 76cf0b9ea..948dd0bc5 100644 --- a/src/test/resources/eager/handles-deferred-in-namespace.expected.jinja +++ b/src/test/resources/eager/handles-deferred-in-namespace.expected.jinja @@ -1,5 +1,7 @@ -{% set ns2 = namespace({} ) %}{% do ns2.update({'a': deferred}) %} -{% set ns1 = namespace({'a': false} ) %}{% if deferred %} +{% set ns2 = namespace({} ) %}\ +{% do ns2.update({'a': deferred}) %} +{% set ns1 = namespace({'a': false} ) %}\ +{% if deferred %} {% set ns1.a = true %} {% endif %} {{ ns1.a }} diff --git a/src/test/resources/eager/handles-deferred-modification-in-caller.expected.jinja b/src/test/resources/eager/handles-deferred-modification-in-caller.expected.jinja index 4412a84d1..7047aafb9 100644 --- a/src/test/resources/eager/handles-deferred-modification-in-caller.expected.jinja +++ b/src/test/resources/eager/handles-deferred-modification-in-caller.expected.jinja @@ -1,2 +1,11 @@ -{% set my_list = ['a', 'b'] %}{% set __macro_callerino_729568755_temp_variable_0__ %}{% do my_list.append(deferred) %}{{ my_list }}{% do my_list.append('d') %}{% endset %}{% call __macro_callerino_729568755_temp_variable_0__ %}{% do my_list.append(deferred) %}{{ my_list }}{% endcall %} +{% set my_list = ['a', 'b'] %}\ +{% set __macro_callerino_729568755_temp_variable_0__ %}\ +{% do my_list.append(deferred) %}\ +{{ my_list }}\ +{% do my_list.append('d') %}\ +{% endset %}\ +{% call __macro_callerino_729568755_temp_variable_0__ %}\ +{% do my_list.append(deferred) %}\ +{{ my_list }}\ +{% endcall %} {{ my_list }} diff --git a/src/test/resources/eager/handles-deferring-loop-variable.expected.jinja b/src/test/resources/eager/handles-deferring-loop-variable.expected.jinja index 740c79b89..d27a1c16c 100644 --- a/src/test/resources/eager/handles-deferring-loop-variable.expected.jinja +++ b/src/test/resources/eager/handles-deferring-loop-variable.expected.jinja @@ -1,14 +1,17 @@ {% for __ignored__ in [0] %} -{% if deferred && true %}first time! +{% if deferred && true %}\ +first time! {% endif %} 1 -{% if deferred && false %}first time! +{% if deferred && false %}\ +first time! {% endif %} 2 {% endfor %} {% for i in [0, 1] %} -{% if deferred && loop.isLast() %}last time! +{% if deferred && loop.isLast() %}\ +last time! {% endif %} {{ loop.index }} {% endfor %} diff --git a/src/test/resources/eager/handles-double-import-modification.expected.jinja b/src/test/resources/eager/handles-double-import-modification.expected.jinja index 1be87dffe..1030e1895 100644 --- a/src/test/resources/eager/handles-double-import-modification.expected.jinja +++ b/src/test/resources/eager/handles-double-import-modification.expected.jinja @@ -1,20 +1,40 @@ -{% do %}{% set current_path = 'deferred-modification.jinja' %}{% set __temp_import_alias_3016318__ = {} %}{% for __ignored__ in [0] %}{% if deferred %} +{% do %}\ +{% set current_path = 'deferred-modification.jinja' %}\ +{% set __temp_import_alias_3016318__ = {} %}\ +{% for __ignored__ in [0] %}\ +{% if deferred %} -{% set foo = 'a' %}{% do __temp_import_alias_3016318__.update({'foo': foo}) %} +{% set foo = 'a' %}\ +{% do __temp_import_alias_3016318__.update({'foo': foo}) %} {% endif %} -{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}{% do __temp_import_alias_3016318__.update({'foo': foo}) %} -{% do __temp_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'deferred-modification.jinja'}) %}{% endfor %}{% set bar1 = __temp_import_alias_3016318__ %}{% set current_path = '' %}{% enddo %} +{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\ +{% do __temp_import_alias_3016318__.update({'foo': foo}) %} +{% do __temp_import_alias_3016318__.update({'foo': foo,'import_resource_path': 'deferred-modification.jinja'}) %}\ +{% endfor %}\ +{% set bar1 = __temp_import_alias_3016318__ %}\ +{% set current_path = '' %}\ +{% enddo %} --- -{% do %}{% set current_path = 'deferred-modification.jinja' %}{% set __temp_import_alias_3016319__ = {} %}{% for __ignored__ in [0] %}{% if deferred %} +{% do %}\ +{% set current_path = 'deferred-modification.jinja' %}\ +{% set __temp_import_alias_3016319__ = {} %}\ +{% for __ignored__ in [0] %}\ +{% if deferred %} -{% set foo = 'a' %}{% do __temp_import_alias_3016319__.update({'foo': foo}) %} +{% set foo = 'a' %}\ +{% do __temp_import_alias_3016319__.update({'foo': foo}) %} {% endif %} -{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}{% do __temp_import_alias_3016319__.update({'foo': foo}) %} -{% do __temp_import_alias_3016319__.update({'foo': foo,'import_resource_path': 'deferred-modification.jinja'}) %}{% endfor %}{% set bar2 = __temp_import_alias_3016319__ %}{% set current_path = '' %}{% enddo %} +{% set foo = filter:join.filter([foo, 'b'], ____int3rpr3t3r____, '') %}\ +{% do __temp_import_alias_3016319__.update({'foo': foo}) %} +{% do __temp_import_alias_3016319__.update({'foo': foo,'import_resource_path': 'deferred-modification.jinja'}) %}\ +{% endfor %}\ +{% set bar2 = __temp_import_alias_3016319__ %}\ +{% set current_path = '' %}\ +{% enddo %} --- {{ bar1.foo }} {{ bar2.foo }} \ No newline at end of file diff --git a/src/test/resources/eager/handles-duplicate-variable-reference-modification/test.expected.jinja b/src/test/resources/eager/handles-duplicate-variable-reference-modification/test.expected.jinja index bdc10a8d8..99f473cf6 100644 --- a/src/test/resources/eager/handles-duplicate-variable-reference-modification/test.expected.jinja +++ b/src/test/resources/eager/handles-duplicate-variable-reference-modification/test.expected.jinja @@ -1,9 +1,16 @@ -{% set the_list = [] %}{% set __macro_appender_2138849093_temp_variable_0__ %}{% set some_list = the_list %}{% if deferred %} +{% set the_list = [] %}\ +{% set __macro_appender_2138849093_temp_variable_0__ %}\ +{% set some_list = the_list %}\ +{% if deferred %} {% do some_list.append(deferred) %} -{% endif %}{% endset %}{{ __macro_appender_2138849093_temp_variable_0__ }} +{% endif %}\ +{% endset %}\ +{{ __macro_appender_2138849093_temp_variable_0__ }} {{ the_list }} -{% set foo = [1] %}{% do foo.append(deferred) %} +{% set foo = [1] %}\ +{% do foo.append(deferred) %} {% do foo.append(2) %} -{% set bar = foo %}{{ foo ~ 'and' ~ bar }} +{% set bar = foo %}\ +{{ foo ~ 'and' ~ bar }} diff --git a/src/test/resources/eager/handles-duplicate-variable-reference-speculative-modification/test.expected.jinja b/src/test/resources/eager/handles-duplicate-variable-reference-speculative-modification/test.expected.jinja index 2a13936f5..92a3012b1 100644 --- a/src/test/resources/eager/handles-duplicate-variable-reference-speculative-modification/test.expected.jinja +++ b/src/test/resources/eager/handles-duplicate-variable-reference-speculative-modification/test.expected.jinja @@ -1,4 +1,6 @@ -{% set foo = ['a', 1] %}{% set bar = foo %}{% if deferred %} +{% set foo = ['a', 1] %}\ +{% set bar = foo %}\ +{% if deferred %} {% do bar.append(2) %} {% endif %} {% do bar.append(3) %} diff --git a/src/test/resources/eager/handles-higher-scope-reference-modification.expected.jinja b/src/test/resources/eager/handles-higher-scope-reference-modification.expected.jinja index 328bb4027..bbb06de9d 100644 --- a/src/test/resources/eager/handles-higher-scope-reference-modification.expected.jinja +++ b/src/test/resources/eager/handles-higher-scope-reference-modification.expected.jinja @@ -1,10 +1,35 @@ -{% set a_list = ['a'] %}{% set __macro_b_125206_temp_variable_0__ %}{% set b_list = a_list %}{% do b_list.append(deferred ? 'b' : '') %} -{% macro c(c_list) %}{% do c_list.append(deferred ? 'c' : '') %} -C: {{ c_list }}.{% endmacro %}{{ c(b_list) }}{% do b_list.append(deferred ? 'B' : '') %} -B: {{ b_list }}.{% endset %}{{ __macro_b_125206_temp_variable_0__ }}{% do a_list.append(deferred ? 'A' : '') %} -A: {{ a_list }}. +{% set a_list = ['a'] %}\ +{% set __macro_b_125206_temp_variable_0__ %}\ +{% set b_list = a_list %}\ +{% do b_list.append(deferred ? 'b' : '') %} +{% macro c(c_list) %}\ +{% do c_list.append(deferred ? 'c' : '') %} +C: {{ c_list }}\ +.{% endmacro %}\ +{{ c(b_list) }}\ +{% do b_list.append(deferred ? 'B' : '') %} +B: {{ b_list }}\ +.{% endset %}\ +{{ __macro_b_125206_temp_variable_0__ }}\ +{% do a_list.append(deferred ? 'A' : '') %} +A: {{ a_list }}\ +. --- -{% set a_list = ['a', 'b'] %}{% for __ignored__ in [0] %}{% set b_list = a_list %}{% for __ignored__ in [0] %}{% set c_list = a_list %}{% if !deferred %}{% do c_list.append(deferred ? 'c' : '') %}{% else %}{% do c_list.append(deferred ? 'c' : '') %}{% endif %} -C: {{ c_list }}.{% endfor %}{% do b_list.append(deferred ? 'B' : '') %} -B: {{ b_list }}.{% endfor %}{% do a_list.append(deferred ? 'A' : '') %} -A: {{ a_list }}. +{% set a_list = ['a', 'b'] %}\ +{% for __ignored__ in [0] %}\ +{% set b_list = a_list %}\ +{% for __ignored__ in [0] %}\ +{% set c_list = a_list %}\ +{% if !deferred %}\ +{% do c_list.append(deferred ? 'c' : '') %}\ +{% else %}\ +{% do c_list.append(deferred ? 'c' : '') %}\ +{% endif %} +C: {{ c_list }}\ +.{% endfor %}\ +{% do b_list.append(deferred ? 'B' : '') %} +B: {{ b_list }}\ +.{% endfor %}\ +{% do a_list.append(deferred ? 'A' : '') %} +A: {{ a_list }}\ +. diff --git a/src/test/resources/eager/handles-import-in-deferred-if.expected.jinja b/src/test/resources/eager/handles-import-in-deferred-if.expected.jinja index 8a6edc388..0659605a1 100644 --- a/src/test/resources/eager/handles-import-in-deferred-if.expected.jinja +++ b/src/test/resources/eager/handles-import-in-deferred-if.expected.jinja @@ -1,7 +1,22 @@ -{% set primary_line_height = 100 %}{% if deferred %} -{% do %}{% set current_path = '../settag/set-val.jinja' %}{% set __temp_import_alias_902286926__ = {} %}{% for __ignored__ in [0] %}{% set primary_line_height = 42 %}{% do __temp_import_alias_902286926__.update({'primary_line_height': primary_line_height}) %}{% do __temp_import_alias_902286926__.update({'primary_line_height': 42,'import_resource_path': '../settag/set-val.jinja'}) %}{% endfor %}{% set simple = __temp_import_alias_902286926__ %}{% set current_path = '' %}{% enddo %} +{% set primary_line_height = 100 %}\ +{% if deferred %} +{% do %}\ +{% set current_path = '../settag/set-val.jinja' %}\ +{% set __temp_import_alias_902286926__ = {} %}\ +{% for __ignored__ in [0] %}\ +{% set primary_line_height = 42 %}\ +{% do __temp_import_alias_902286926__.update({'primary_line_height': primary_line_height}) %}\ +{% do __temp_import_alias_902286926__.update({'primary_line_height': 42,'import_resource_path': '../settag/set-val.jinja'}) %}\ +{% endfor %}\ +{% set simple = __temp_import_alias_902286926__ %}\ +{% set current_path = '' %}\ +{% enddo %} {% else %} -{% do %}{% set current_path = '../settag/set-val.jinja' %}{% set primary_line_height = 42 %}{% set current_path = '' %}{% enddo %} +{% do %}\ +{% set current_path = '../settag/set-val.jinja' %}\ +{% set primary_line_height = 42 %}\ +{% set current_path = '' %}\ +{% enddo %} {% endif %} simple.primary_line_height (deferred): {{ simple.primary_line_height }} primary_line_height (deferred): {{ primary_line_height }} diff --git a/src/test/resources/eager/handles-loop-var-against-deferred-in-loop.expected.jinja b/src/test/resources/eager/handles-loop-var-against-deferred-in-loop.expected.jinja index b5d29833f..79193546c 100644 --- a/src/test/resources/eager/handles-loop-var-against-deferred-in-loop.expected.jinja +++ b/src/test/resources/eager/handles-loop-var-against-deferred-in-loop.expected.jinja @@ -1,4 +1,11 @@ -{% for __ignored__ in [0] %}item1 {{ deferred }}.{% set temp = 'item1' ~ deferred %}{{ temp }} -item2 {{ deferred }}.{% set temp = 'item2' ~ deferred %}{{ temp }} -item3 {{ deferred }}.{% set temp = 'item3' ~ deferred %}{{ temp }} +{% for __ignored__ in [0] %}\ +item1 {{ deferred }}\ +.{% set temp = 'item1' ~ deferred %}\ +{{ temp }} +item2 {{ deferred }}\ +.{% set temp = 'item2' ~ deferred %}\ +{{ temp }} +item3 {{ deferred }}\ +.{% set temp = 'item3' ~ deferred %}\ +{{ temp }} {% endfor %} diff --git a/src/test/resources/eager/handles-reference-modification-when-source-is-lost.expected.jinja b/src/test/resources/eager/handles-reference-modification-when-source-is-lost.expected.jinja index 3001accc0..dccbe067b 100644 --- a/src/test/resources/eager/handles-reference-modification-when-source-is-lost.expected.jinja +++ b/src/test/resources/eager/handles-reference-modification-when-source-is-lost.expected.jinja @@ -1,13 +1,18 @@ -{% set a_list = ['a'] %}{% for __ignored__ in [0] %}{% set b_list = a_list %}{% do b_list.append(deferred) %} +{% set a_list = ['a'] %}\ +{% for __ignored__ in [0] %}\ +{% set b_list = a_list %}\ +{% do b_list.append(deferred) %} {% endfor %} {{ a_list }} --- {% for __ignored__ in [0] %} -{% set a_list = [] %}{% for __ignored__ in [0] %} +{% set a_list = [] %}\ +{% for __ignored__ in [0] %} {% if deferred %} {% set b_list = [] %} -{% set b_list = a_list %}{% do b_list.append(1) %} +{% set b_list = a_list %}\ +{% do b_list.append(1) %} {% endif %} {% endfor %} {{ a_list }} diff --git a/src/test/resources/eager/handles-same-name-import-var.expected.jinja b/src/test/resources/eager/handles-same-name-import-var.expected.jinja index 60785735d..1899f2a94 100644 --- a/src/test/resources/eager/handles-same-name-import-var.expected.jinja +++ b/src/test/resources/eager/handles-same-name-import-var.expected.jinja @@ -1,10 +1,39 @@ {% if deferred %} -{% do %}{% set current_path = '../settag/set-var-and-deferred.jinja' %}{% set __temp_import_alias_1059697132__ = {} %}{% for __ignored__ in [0] %}{% if deferred %} -{% do %}{% set path = '' %}{% do __temp_import_alias_1059697132__.update({'path': path}) %}{% set my_var = {'my_var': {'foo': 'bar'} } %}{% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %}{% set path = '../settag/set-var-and-deferred.jinja' %}{% do __temp_import_alias_1059697132__.update({'path': path}) %}{% set value = null %}{% do __temp_import_alias_1059697132__.update({'value': value}) %}{% set my_var = {} %}{% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %}{% set my_var = {'foo': 'bar'} %}{% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %}{% set my_var = {'my_var': {'foo': 'bar'} } %}{% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %} -{% set value = deferred %}{% do __temp_import_alias_1059697132__.update({'value': value}) %}{% set my_var = {'my_var': {'foo': 'bar'} } %}{% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %}{% do my_var.update({'value': value}) %} -{% do my_var.update({'import_resource_path': '../settag/set-var-and-deferred.jinja', 'value': value}) %}{% set path = '' %}{% do __temp_import_alias_1059697132__.update({'path': path}) %}{% enddo %} +{% do %}\ +{% set current_path = '../settag/set-var-and-deferred.jinja' %}\ +{% set __temp_import_alias_1059697132__ = {} %}\ +{% for __ignored__ in [0] %}\ +{% if deferred %} +{% do %}\ +{% set path = '' %}\ +{% do __temp_import_alias_1059697132__.update({'path': path}) %}\ +{% set my_var = {'my_var': {'foo': 'bar'} } %}\ +{% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %}\ +{% set path = '../settag/set-var-and-deferred.jinja' %}\ +{% do __temp_import_alias_1059697132__.update({'path': path}) %}\ +{% set value = null %}\ +{% do __temp_import_alias_1059697132__.update({'value': value}) %}\ +{% set my_var = {} %}\ +{% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %}\ +{% set my_var = {'foo': 'bar'} %}\ +{% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %}\ +{% set my_var = {'my_var': {'foo': 'bar'} } %}\ +{% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %} +{% set value = deferred %}\ +{% do __temp_import_alias_1059697132__.update({'value': value}) %}\ +{% set my_var = {'my_var': {'foo': 'bar'} } %}\ +{% do __temp_import_alias_1059697132__.update({'my_var': my_var}) %}\ +{% do my_var.update({'value': value}) %} +{% do my_var.update({'import_resource_path': '../settag/set-var-and-deferred.jinja', 'value': value}) %}\ +{% set path = '' %}\ +{% do __temp_import_alias_1059697132__.update({'path': path}) %}\ +{% enddo %} {{ my_var }} {% endif %} -{% do __temp_import_alias_1059697132__.update({'path': path,'import_resource_path': '../settag/set-var-and-deferred.jinja','value': value}) %}{% endfor %}{% set my_var = __temp_import_alias_1059697132__ %}{% set current_path = '' %}{% enddo %} +{% do __temp_import_alias_1059697132__.update({'path': path,'import_resource_path': '../settag/set-var-and-deferred.jinja','value': value}) %}\ +{% endfor %}\ +{% set my_var = __temp_import_alias_1059697132__ %}\ +{% set current_path = '' %}\ +{% enddo %} {{ filter:dictsort.filter(my_var, ____int3rpr3t3r____, false, 'key') }} {% endif %} diff --git a/src/test/resources/eager/handles-set-and-modified-in-for.expected.jinja b/src/test/resources/eager/handles-set-and-modified-in-for.expected.jinja index 51fd3039f..63d333221 100644 --- a/src/test/resources/eager/handles-set-and-modified-in-for.expected.jinja +++ b/src/test/resources/eager/handles-set-and-modified-in-for.expected.jinja @@ -1,4 +1,5 @@ -{% set list = [] %}{% for item in deferred %} +{% set list = [] %}\ +{% for item in deferred %} {% unless count %} {% set count = 0 %} {% endunless %} diff --git a/src/test/resources/eager/handles-set-in-for.expected.jinja b/src/test/resources/eager/handles-set-in-for.expected.jinja index 652ae0b77..1278f7a47 100644 --- a/src/test/resources/eager/handles-set-in-for.expected.jinja +++ b/src/test/resources/eager/handles-set-in-for.expected.jinja @@ -1,4 +1,5 @@ -{% set list = [] %}{% for item in deferred %} +{% set list = [] %}\ +{% for item in deferred %} {% set count = 0 %} {% do list.append(0) %} {% set count = 1 %} diff --git a/src/test/resources/eager/handles-value-modified-in-macro.expected.jinja b/src/test/resources/eager/handles-value-modified-in-macro.expected.jinja index 040d6b165..ed3cd4b73 100644 --- a/src/test/resources/eager/handles-value-modified-in-macro.expected.jinja +++ b/src/test/resources/eager/handles-value-modified-in-macro.expected.jinja @@ -4,7 +4,8 @@ {{ counter(foo) }} {% endif %} {{ level }} -{% endmacro %}{{ counter(deferred) }} +{% endmacro %}\ +{{ counter(deferred) }} {% macro counter(foo) %} {% set level = level + 2 %} @@ -12,4 +13,5 @@ {{ counter(foo) }} {% endif %} {{ level }} -{% endmacro %}{{ counter(2) }} +{% endmacro %}\ +{{ counter(2) }} diff --git a/src/test/resources/eager/has-proper-line-stripping.expected.jinja b/src/test/resources/eager/has-proper-line-stripping.expected.jinja index a56e56254..fe4d2dad2 100644 --- a/src/test/resources/eager/has-proper-line-stripping.expected.jinja +++ b/src/test/resources/eager/has-proper-line-stripping.expected.jinja @@ -1,3 +1,8 @@ 1 2 -3{% if deferred > 0 %}{{ deferred }}{% elif deferred == 0 %}null{% else %}{{ deferred }}{% endif %} +3{% if deferred > 0 %}\ +{{ deferred }}\ +{% elif deferred == 0 %}\ +null{% else %}\ +{{ deferred }}\ +{% endif %} diff --git a/src/test/resources/eager/keeps-macro-modifications-in-scope.expected.jinja b/src/test/resources/eager/keeps-macro-modifications-in-scope.expected.jinja index a6bd5b97a..98ddd3fac 100644 --- a/src/test/resources/eager/keeps-macro-modifications-in-scope.expected.jinja +++ b/src/test/resources/eager/keeps-macro-modifications-in-scope.expected.jinja @@ -1,10 +1,35 @@ -{% set list = [] %}{% if deferred %} +{% set list = [] %}\ +{% if deferred %} -{% set __macro_inc_100372882_temp_variable_0__ %}{% do list.append(1) %}1{% set depth = 2 %} -{% set __macro_inc_100372882_temp_variable_1__ %}{% do list.append(2) %}2{% set depth = 3 %} -{% set __macro_inc_100372882_temp_variable_2__ %}{% do list.append(3) %}3{% endset %}{{ __macro_inc_100372882_temp_variable_2__ }} -{% set __macro_inc_100372882_temp_variable_3__ %}{% do list.append(3) %}3{% endset %}{{ __macro_inc_100372882_temp_variable_3__ }}{% endset %}{{ __macro_inc_100372882_temp_variable_1__ }} -{% set __macro_inc_100372882_temp_variable_4__ %}{% do list.append(2) %}2{% set depth = 3 %} -{% set __macro_inc_100372882_temp_variable_5__ %}{% do list.append(3) %}3{% endset %}{{ __macro_inc_100372882_temp_variable_5__ }} -{% set __macro_inc_100372882_temp_variable_6__ %}{% do list.append(3) %}3{% endset %}{{ __macro_inc_100372882_temp_variable_6__ }}{% endset %}{{ __macro_inc_100372882_temp_variable_4__ }}{% endset %}{{ __macro_inc_100372882_temp_variable_0__ }} +{% set __macro_inc_100372882_temp_variable_0__ %}\ +{% do list.append(1) %}\ +1{% set depth = 2 %} +{% set __macro_inc_100372882_temp_variable_1__ %}\ +{% do list.append(2) %}\ +2{% set depth = 3 %} +{% set __macro_inc_100372882_temp_variable_2__ %}\ +{% do list.append(3) %}\ +3{% endset %}\ +{{ __macro_inc_100372882_temp_variable_2__ }} +{% set __macro_inc_100372882_temp_variable_3__ %}\ +{% do list.append(3) %}\ +3{% endset %}\ +{{ __macro_inc_100372882_temp_variable_3__ }}\ +{% endset %}\ +{{ __macro_inc_100372882_temp_variable_1__ }} +{% set __macro_inc_100372882_temp_variable_4__ %}\ +{% do list.append(2) %}\ +2{% set depth = 3 %} +{% set __macro_inc_100372882_temp_variable_5__ %}\ +{% do list.append(3) %}\ +3{% endset %}\ +{{ __macro_inc_100372882_temp_variable_5__ }} +{% set __macro_inc_100372882_temp_variable_6__ %}\ +{% do list.append(3) %}\ +3{% endset %}\ +{{ __macro_inc_100372882_temp_variable_6__ }}\ +{% endset %}\ +{{ __macro_inc_100372882_temp_variable_4__ }}\ +{% endset %}\ +{{ __macro_inc_100372882_temp_variable_0__ }} {% endif %} diff --git a/src/test/resources/eager/keeps-meta-context-variables-through-import/test.expected.jinja b/src/test/resources/eager/keeps-meta-context-variables-through-import/test.expected.jinja index dbced8528..d44133a16 100644 --- a/src/test/resources/eager/keeps-meta-context-variables-through-import/test.expected.jinja +++ b/src/test/resources/eager/keeps-meta-context-variables-through-import/test.expected.jinja @@ -1,4 +1,5 @@ {% set list = deferred %} -{% set meta = ['overridden'] %}{% do list.append(meta) %} +{% set meta = ['overridden'] %}\ +{% do list.append(meta) %} {{ list }} \ No newline at end of file diff --git a/src/test/resources/eager/modifies-variable-in-deferred-macro.expected.jinja b/src/test/resources/eager/modifies-variable-in-deferred-macro.expected.jinja index 384c52ede..431eba66b 100644 --- a/src/test/resources/eager/modifies-variable-in-deferred-macro.expected.jinja +++ b/src/test/resources/eager/modifies-variable-in-deferred-macro.expected.jinja @@ -1,14 +1,20 @@ {% macro my_macro(list, other) %} {% do list.append(other) %} -{% endmacro %}{% set list = [] %}{% do my_macro(list, deferred) %} +{% endmacro %}\ +{% set list = [] %}\ +{% do my_macro(list, deferred) %} {{ list }} {% macro my_macro(list, other) %} {% do list.append(other) %} -{% endmacro %}{% set var = [] %}{% do my_macro(var, deferred) %} +{% endmacro %}\ +{% set var = [] %}\ +{% do my_macro(var, deferred) %} {{ var }} {% macro my_macro(list, other) %} {% do list.append(other) %} -{% endmacro %}{% set var2 = [] %}{% do my_macro(var2, 1) %} +{% endmacro %}\ +{% set var2 = [] %}\ +{% do my_macro(var2, 1) %} {{ var2 }} diff --git a/src/test/resources/eager/only-defers-loop-item-on-current-context.expected.jinja b/src/test/resources/eager/only-defers-loop-item-on-current-context.expected.jinja index f8d4f070b..760c22ba2 100644 --- a/src/test/resources/eager/only-defers-loop-item-on-current-context.expected.jinja +++ b/src/test/resources/eager/only-defers-loop-item-on-current-context.expected.jinja @@ -1,7 +1,9 @@ -{% set outer_val = 'start' %}{% for def in deferred %} +{% set outer_val = 'start' %}\ +{% for def in deferred %} {% set outer_list = [{'a': ['b']} ] %} {% for __ignored__ in [0] %} -{% set map = {'a': ['b']} %}{% set inner_list = map.a %} +{% set map = {'a': ['b']} %}\ +{% set inner_list = map.a %} {% for x in inner_list %} {% set outer_val = outer_val ~ '-' %} diff --git a/src/test/resources/eager/prepends-set-if-state-changes.expected.jinja b/src/test/resources/eager/prepends-set-if-state-changes.expected.jinja index c3f4122f1..102f5477a 100644 --- a/src/test/resources/eager/prepends-set-if-state-changes.expected.jinja +++ b/src/test/resources/eager/prepends-set-if-state-changes.expected.jinja @@ -1,4 +1,5 @@ -{% set foo = [0] %}{% set deferred = deferred && foo.append(1) %} +{% set foo = [0] %}\ +{% set deferred = deferred && foo.append(1) %} {% do foo.append(2) %} {% set deferred = deferred && foo.append(3) %} {% print foo.append(4) %} diff --git a/src/test/resources/eager/preserves-raw-inside-deferred-set-block.expected.jinja b/src/test/resources/eager/preserves-raw-inside-deferred-set-block.expected.jinja index 6dacc5a97..eb79d845d 100644 --- a/src/test/resources/eager/preserves-raw-inside-deferred-set-block.expected.jinja +++ b/src/test/resources/eager/preserves-raw-inside-deferred-set-block.expected.jinja @@ -1,6 +1,8 @@ {% set foo %} {% if deferred %} -{% raw %}{{ 'fire' }}{% endraw %} +{% raw %}\ +{{ 'fire' }}\ +{% endraw %} {% else %} water {% endif %} diff --git a/src/test/resources/eager/preserves-value-set-in-if.expected.jinja b/src/test/resources/eager/preserves-value-set-in-if.expected.jinja index e34006f5a..b59f49423 100644 --- a/src/test/resources/eager/preserves-value-set-in-if.expected.jinja +++ b/src/test/resources/eager/preserves-value-set-in-if.expected.jinja @@ -1,5 +1,6 @@ 2 -{% set foo = 2 %}{% if deferred %} +{% set foo = 2 %}\ +{% if deferred %} {% set foo = deferred %} {% endif %} {{ foo }} diff --git a/src/test/resources/eager/puts-deferred-fromed-macro-in-output.expected.jinja b/src/test/resources/eager/puts-deferred-fromed-macro-in-output.expected.jinja index be059f126..f0d83460d 100644 --- a/src/test/resources/eager/puts-deferred-fromed-macro-in-output.expected.jinja +++ b/src/test/resources/eager/puts-deferred-fromed-macro-in-output.expected.jinja @@ -1 +1,5 @@ -{% set myname = deferred + 3 %}{% set __macro_getPath_331491059_temp_variable_1__ %}Hello {{ myname }}{% endset %}{% print __macro_getPath_331491059_temp_variable_1__ %} +{% set myname = deferred + 3 %}\ +{% set __macro_getPath_331491059_temp_variable_1__ %}\ +Hello {{ myname }}\ +{% endset %}\ +{% print __macro_getPath_331491059_temp_variable_1__ %} \ No newline at end of file diff --git a/src/test/resources/eager/puts-deferred-imported-macro-in-output.expected.jinja b/src/test/resources/eager/puts-deferred-imported-macro-in-output.expected.jinja index fde94f4f8..f0d83460d 100644 --- a/src/test/resources/eager/puts-deferred-imported-macro-in-output.expected.jinja +++ b/src/test/resources/eager/puts-deferred-imported-macro-in-output.expected.jinja @@ -1 +1,5 @@ -{% set myname = deferred + 3 %}{% set __macro_getPath_331491059_temp_variable_1__ %}Hello {{ myname }}{% endset %}{% print __macro_getPath_331491059_temp_variable_1__ %} \ No newline at end of file +{% set myname = deferred + 3 %}\ +{% set __macro_getPath_331491059_temp_variable_1__ %}\ +Hello {{ myname }}\ +{% endset %}\ +{% print __macro_getPath_331491059_temp_variable_1__ %} \ No newline at end of file diff --git a/src/test/resources/eager/reconstructs-aliased-macro.expected.jinja b/src/test/resources/eager/reconstructs-aliased-macro.expected.jinja index 4c249d887..e0c07bb04 100644 --- a/src/test/resources/eager/reconstructs-aliased-macro.expected.jinja +++ b/src/test/resources/eager/reconstructs-aliased-macro.expected.jinja @@ -1,4 +1,9 @@ -{% set myname = deferred + 3 %}{% set deferred_import_resource_path = 'eager/takes-param.jinja' %}{% macro macros.takes_param(foo) %}{% set bar = 'bar' %} +{% set myname = deferred + 3 %}\ +{% set deferred_import_resource_path = 'eager/takes-param.jinja' %}\ +{% macro macros.takes_param(foo) %}\ +{% set bar = 'bar' %} {% print foo %} -{% endmacro %}{% set deferred_import_resource_path = null %}{% set answer = macros.takes_param(myname) %} +{% endmacro %}\ +{% set deferred_import_resource_path = null %}\ +{% set answer = macros.takes_param(myname) %} {{ answer }} diff --git a/src/test/resources/eager/reconstructs-block-path-when-deferred-nested/test.expected.jinja b/src/test/resources/eager/reconstructs-block-path-when-deferred-nested/test.expected.jinja index 34ee87f9c..18b8cc558 100644 --- a/src/test/resources/eager/reconstructs-block-path-when-deferred-nested/test.expected.jinja +++ b/src/test/resources/eager/reconstructs-block-path-when-deferred-nested/test.expected.jinja @@ -1,11 +1,22 @@ -{% set current_path = '../../eager/reconstructs-block-path-when-deferred-nested/base.jinja' %}{% set prefix = deferred ? 'current' : 'current' %} -Parent's current path is: {{ '{{' + prefix + '_path }}' }} +{% set current_path = '../../eager/reconstructs-block-path-when-deferred-nested/base.jinja' %}\ +{% set prefix = deferred ? 'current' : 'current' %} +Parent's current path is: {{ '{{' + prefix + '_path }}\ +' }} -----Pre-First----- -{% set temp_current_path_586961858 = current_path %}{% set current_path = 'Child path' %}{% set prefix = deferred ? 'current' : 'current' %}Child's first current path is: {{ '{{' + prefix + '_path }}' }} +{% set temp_current_path_586961858 = current_path %}\ +{% set current_path = 'Child path' %}\ +{% set prefix = deferred ? 'current' : 'current' %}\ +Child's first current path is: {{ '{{' + prefix + '_path }}\ +' }} {% set current_path = temp_current_path_586961858 %} -----Post-First----- -----Pre-Second----- -{% set temp_current_path_435835221 = current_path %}{% set current_path = '../../eager/reconstructs-block-path-when-deferred-nested/middle.jinja' %}{% set prefix = deferred ? 'current' : 'current' %}Middle's second current path is: {{ '{{' + prefix + '_path }}' }} +{% set temp_current_path_435835221 = current_path %}\ +{% set current_path = '../../eager/reconstructs-block-path-when-deferred-nested/middle.jinja' %}\ +{% set prefix = deferred ? 'current' : 'current' %}\ +Middle's second current path is: {{ '{{' + prefix + '_path }}\ +' }} {% set current_path = temp_current_path_435835221 %} -----Post-Second----- -Parent's current path is: {{ '{{' + prefix + '_path }}' }} +Parent's current path is: {{ '{{' + prefix + '_path }}\ +' }} diff --git a/src/test/resources/eager/reconstructs-block-path-when-deferred/test.expected.jinja b/src/test/resources/eager/reconstructs-block-path-when-deferred/test.expected.jinja index 8ee1e7cad..76c8c8db2 100644 --- a/src/test/resources/eager/reconstructs-block-path-when-deferred/test.expected.jinja +++ b/src/test/resources/eager/reconstructs-block-path-when-deferred/test.expected.jinja @@ -1,7 +1,14 @@ -{% set current_path = '../../eager/reconstructs-block-path-when-deferred/base.jinja' %}{% set prefix = deferred ? 'current' : 'current' %} -Parent's current path is: {{ '{{' + prefix + '_path }}' }} +{% set current_path = '../../eager/reconstructs-block-path-when-deferred/base.jinja' %}\ +{% set prefix = deferred ? 'current' : 'current' %} +Parent's current path is: {{ '{{' + prefix + '_path }}\ +' }} -----Pre-Block----- -{% set temp_current_path_586961858 = current_path %}{% set current_path = 'Child path' %}{% set prefix = deferred ? 'current' : 'current' %}Block's current path is: {{ '{{' + prefix + '_path }}' }} +{% set temp_current_path_586961858 = current_path %}\ +{% set current_path = 'Child path' %}\ +{% set prefix = deferred ? 'current' : 'current' %}\ +Block's current path is: {{ '{{' + prefix + '_path }}\ +' }} {% set current_path = temp_current_path_586961858 %} -----Post-Block----- -Parent's current path is: {{ '{{' + prefix + '_path }}' }} +Parent's current path is: {{ '{{' + prefix + '_path }}\ +' }} diff --git a/src/test/resources/eager/reconstructs-block-set-variables-in-for-loop.expected.jinja b/src/test/resources/eager/reconstructs-block-set-variables-in-for-loop.expected.jinja index a1b04e857..d0152a7f9 100644 --- a/src/test/resources/eager/reconstructs-block-set-variables-in-for-loop.expected.jinja +++ b/src/test/resources/eager/reconstructs-block-set-variables-in-for-loop.expected.jinja @@ -1,5 +1,6 @@ {% for i in range(deferred) %} {% set __macro_foo_97643642_temp_variable_0__ %} {{ deferred }} -{% endset %}{{ filter:int.filter(__macro_foo_97643642_temp_variable_0__, ____int3rpr3t3r____) + 3 }} +{% endset %}\ +{{ filter:int.filter(__macro_foo_97643642_temp_variable_0__, ____int3rpr3t3r____) + 3 }} {% endfor %} diff --git a/src/test/resources/eager/reconstructs-deferred-variable-eventually.expected.jinja b/src/test/resources/eager/reconstructs-deferred-variable-eventually.expected.jinja index daa671edf..cf2e3900d 100644 --- a/src/test/resources/eager/reconstructs-deferred-variable-eventually.expected.jinja +++ b/src/test/resources/eager/reconstructs-deferred-variable-eventually.expected.jinja @@ -1,13 +1,17 @@ -{% set my_list = [] %}{% set __macro_append_stuff_153654787_temp_variable_0__ %} +{% set my_list = [] %}\ +{% set __macro_append_stuff_153654787_temp_variable_0__ %} {% if deferred %} {% set __macro_foo_97643642_temp_variable_0__ %} {% do my_list.append('b') %} -{% endset %}{{ __macro_foo_97643642_temp_variable_0__ }} +{% endset %}\ +{{ __macro_foo_97643642_temp_variable_0__ }} {% set __macro_foo_97643642_temp_variable_1__ %} {% do my_list.append('c') %} -{% endset %}{{ __macro_foo_97643642_temp_variable_1__ }} +{% endset %}\ +{{ __macro_foo_97643642_temp_variable_1__ }} {% endif %} -{% endset %}{{ __macro_append_stuff_153654787_temp_variable_0__ }} +{% endset %}\ +{{ __macro_append_stuff_153654787_temp_variable_0__ }} {{ my_list }} diff --git a/src/test/resources/eager/reconstructs-map-node.expected.jinja b/src/test/resources/eager/reconstructs-map-node.expected.jinja index 74c2a45a1..12eeae891 100644 --- a/src/test/resources/eager/reconstructs-map-node.expected.jinja +++ b/src/test/resources/eager/reconstructs-map-node.expected.jinja @@ -1,11 +1,16 @@ {% if deferred %} {% set foo = [fn:map_entry('foo', 'ff'), fn:map_entry('bar', 'bb')] %} {% endif %} -{% set my_list = [] %}{% for key, val in foo %}{% do my_list.append(deferred) %} -{{ key ~ ' ' ~ val }}{% endfor %} +{% set my_list = [] %}\ +{% for key, val in foo %}\ +{% do my_list.append(deferred) %} +{{ key ~ ' ' ~ val }}\ +{% endfor %} {{ my_list }} -{% set my_list = [] %}{% for __ignored__ in [0] %}{% do my_list.append(deferred) %} +{% set my_list = [] %}\ +{% for __ignored__ in [0] %}\ +{% do my_list.append(deferred) %} foo{% do my_list.append(deferred) %} bar{% endfor %} {{ my_list }} diff --git a/src/test/resources/eager/reconstructs-namespace-for-set-tags-using-period.expected.jinja b/src/test/resources/eager/reconstructs-namespace-for-set-tags-using-period.expected.jinja index 656c19e5b..72b11121d 100644 --- a/src/test/resources/eager/reconstructs-namespace-for-set-tags-using-period.expected.jinja +++ b/src/test/resources/eager/reconstructs-namespace-for-set-tags-using-period.expected.jinja @@ -1,7 +1,11 @@ -{% set ns1 = namespace({'a': 'aa'} ) %}{% set ns1.b = 'b ' ~ deferred %} +{% set ns1 = namespace({'a': 'aa'} ) %}\ +{% set ns1.b = 'b ' ~ deferred %} -{% set ns2 = namespace({'c': 'cc'} ) %}{% set ns2.d %}d {{ deferred }}{% endset %} +{% set ns2 = namespace({'c': 'cc'} ) %}\ +{% set ns2.d %}\ +d {{ deferred }}\ +{% endset %} {{ ns1 }} {{ ns2 }} diff --git a/src/test/resources/eager/reconstructs-nested-value-in-string-representation.expected.jinja b/src/test/resources/eager/reconstructs-nested-value-in-string-representation.expected.jinja index 12b0ab2a5..6fb1f5520 100644 --- a/src/test/resources/eager/reconstructs-nested-value-in-string-representation.expected.jinja +++ b/src/test/resources/eager/reconstructs-nested-value-in-string-representation.expected.jinja @@ -1,15 +1,30 @@ -{% set i_am = 'I am' %}{% set bar = '{{ i_am }} bar' %}{% set foo = '{{ i_am }} foo' %}{% set map_with_vals = {'foo': 'Foo is {{ foo }}.'} %}{% if deferred %} -{% do map_with_vals.put('bar', 'Bar is {{ bar }}.') %} +{% set i_am = 'I am' %}\ +{% set bar = '{{ i_am }} bar' %}\ +{% set foo = '{{ i_am }} foo' %}\ +{% set map_with_vals = {'foo': 'Foo is {{ foo }}\ +.'} %}\ +{% if deferred %} +{% do map_with_vals.put('bar', 'Bar is {{ bar }}\ +.') %} {% endif %} map.foo: {{ map_with_vals.foo }} map.bar: {{ map_with_vals.bar }} -{% set a = 'a' %}{% set aa = '{{ a }}' %}{% if deferred %} -{% set aaa = '{{ aa }}' %} +{% set a = 'a' %}\ +{% set aa = '{{ a }}\ +' %}\ +{% if deferred %} +{% set aaa = '{{ aa }}\ +' %} {{ aa }} {% endif %} -{% set b = 'b' %}{% set bb = '{{ b }}' %}{% if deferred %} -{% set bbb = {'b': '{{ bb }}'} %} -{'b': '{{ bb }}'} +{% set b = 'b' %}\ +{% set bb = '{{ b }}\ +' %}\ +{% if deferred %} +{% set bbb = {'b': '{{ bb }}\ +'} %} +{'b': '{{ bb }}\ +'} {% endif %} \ No newline at end of file diff --git a/src/test/resources/eager/reconstructs-null-variables-in-deferred-caller.expected.jinja b/src/test/resources/eager/reconstructs-null-variables-in-deferred-caller.expected.jinja index ee7445dbf..07c749944 100644 --- a/src/test/resources/eager/reconstructs-null-variables-in-deferred-caller.expected.jinja +++ b/src/test/resources/eager/reconstructs-null-variables-in-deferred-caller.expected.jinja @@ -1,9 +1,11 @@ {% if deferred %} {% macro foo(var) %} {% set second_list = [] %} -{% set second_list = [] %}{% do second_list.append(var) %} +{% set second_list = [] %}\ +{% do second_list.append(var) %} {{ caller() }} -{% endmacro %}{% call foo(deferred) %} +{% endmacro %}\ +{% call foo(deferred) %} [] {{ second_list }} {% endcall %} diff --git a/src/test/resources/eager/reconstructs-value-used-in-deferred-imported-macro.expected.jinja b/src/test/resources/eager/reconstructs-value-used-in-deferred-imported-macro.expected.jinja index 47d603370..1246685cd 100644 --- a/src/test/resources/eager/reconstructs-value-used-in-deferred-imported-macro.expected.jinja +++ b/src/test/resources/eager/reconstructs-value-used-in-deferred-imported-macro.expected.jinja @@ -1,10 +1,27 @@ -{% do %}{% set current_path = 'uses-deferred-value-in-macro.jinja' %}{% set __temp_import_alias_1081745881__ = {} %}{% for __ignored__ in [0] %}{% set value = deferred %}{% do __temp_import_alias_1081745881__.update({'value': value}) %} +{% do %}\ +{% set current_path = 'uses-deferred-value-in-macro.jinja' %}\ +{% set __temp_import_alias_1081745881__ = {} %}\ +{% for __ignored__ in [0] %}\ +{% set value = deferred %}\ +{% do __temp_import_alias_1081745881__.update({'value': value}) %} -{% do __temp_import_alias_1081745881__.update({'import_resource_path': 'uses-deferred-value-in-macro.jinja','value': value}) %}{% endfor %}{% set macros = __temp_import_alias_1081745881__ %}{% set current_path = '' %}{% enddo %} +{% do __temp_import_alias_1081745881__.update({'import_resource_path': 'uses-deferred-value-in-macro.jinja','value': value}) %}\ +{% endfor %}\ +{% set macros = __temp_import_alias_1081745881__ %}\ +{% set current_path = '' %}\ +{% enddo %} -{% set deferred_import_resource_path = 'uses-deferred-value-in-macro.jinja' %}{% macro macros.getValueAnd(other) %}{% set value = macros.value %} +{% set deferred_import_resource_path = 'uses-deferred-value-in-macro.jinja' %}\ +{% macro macros.getValueAnd(other) %}\ +{% set value = macros.value %} {{ value ~ ' ' ~ other }} -{% endmacro %}{% set deferred_import_resource_path = null %}{{ macros.getValueAnd(1) }} -{% set deferred_import_resource_path = 'uses-deferred-value-in-macro.jinja' %}{% macro macros.getValueAnd(other) %}{% set value = macros.value %} +{% endmacro %}\ +{% set deferred_import_resource_path = null %}\ +{{ macros.getValueAnd(1) }} +{% set deferred_import_resource_path = 'uses-deferred-value-in-macro.jinja' %}\ +{% macro macros.getValueAnd(other) %}\ +{% set value = macros.value %} {{ value ~ ' ' ~ other }} -{% endmacro %}{% set deferred_import_resource_path = null %}{{ macros.getValueAnd(deferred) }} +{% endmacro %}\ +{% set deferred_import_resource_path = null %}\ +{{ macros.getValueAnd(deferred) }} diff --git a/src/test/resources/eager/reconstructs-with-multiple-loops.expected.jinja b/src/test/resources/eager/reconstructs-with-multiple-loops.expected.jinja index 5f637d1a2..6f81e2636 100644 --- a/src/test/resources/eager/reconstructs-with-multiple-loops.expected.jinja +++ b/src/test/resources/eager/reconstructs-with-multiple-loops.expected.jinja @@ -1,6 +1,8 @@ [][] [0][0] -{% set alpha = [0] %}{% set beta = [0] %}{% for i in deferred %} +{% set alpha = [0] %}\ +{% set beta = [0] %}\ +{% for i in deferred %} {% if deferred %} {% for j in deferred %} {% if deferred %} diff --git a/src/test/resources/eager/reconstructs-words-from-inside-nested-expressions.expected.jinja b/src/test/resources/eager/reconstructs-words-from-inside-nested-expressions.expected.jinja index b25302fc8..c64e0b1ae 100644 --- a/src/test/resources/eager/reconstructs-words-from-inside-nested-expressions.expected.jinja +++ b/src/test/resources/eager/reconstructs-words-from-inside-nested-expressions.expected.jinja @@ -1,3 +1,5 @@ -{% set foo = 'a' %}{% do deferred.append('{{ foo }}') %} +{% set foo = 'a' %}\ +{% do deferred.append('{{ foo }}\ +') %} {{ deferred[0] }} {% print deferred[0] %} diff --git a/src/test/resources/eager/reverts-modification-with-deferred-loop.expected.jinja b/src/test/resources/eager/reverts-modification-with-deferred-loop.expected.jinja index f1de11b60..57568c5f2 100644 --- a/src/test/resources/eager/reverts-modification-with-deferred-loop.expected.jinja +++ b/src/test/resources/eager/reverts-modification-with-deferred-loop.expected.jinja @@ -1,4 +1,5 @@ -{% set my_list = [] %}{% for __ignored__ in [0] %} +{% set my_list = [] %}\ +{% for __ignored__ in [0] %} {% for j in deferred %} {% if loop.first %} {% do my_list.append(1) %} diff --git a/src/test/resources/eager/reverts-simple.expected.jinja b/src/test/resources/eager/reverts-simple.expected.jinja index fb1635add..1e69abbd1 100644 --- a/src/test/resources/eager/reverts-simple.expected.jinja +++ b/src/test/resources/eager/reverts-simple.expected.jinja @@ -1,5 +1,6 @@ {% for __ignored__ in [0] %} - {% set my_list = [0, 1] %}{% if deferred %} + {% set my_list = [0, 1] %}\ +{% if deferred %} {% do my_list.append(2) %} {% endif %} {% do my_list.append(3) %} diff --git a/src/test/resources/eager/runs-macro-function-in-deferred-execution-mode.expected.jinja b/src/test/resources/eager/runs-macro-function-in-deferred-execution-mode.expected.jinja index a269291c7..d7ce85653 100644 --- a/src/test/resources/eager/runs-macro-function-in-deferred-execution-mode.expected.jinja +++ b/src/test/resources/eager/runs-macro-function-in-deferred-execution-mode.expected.jinja @@ -1,7 +1,9 @@ -{% set holder = {'val': -1} %}{% for i in range(deferred) %} +{% set holder = {'val': -1} %}\ +{% for i in range(deferred) %} {% set __macro_modify_615470226_temp_variable_1__ %} {% do holder.update({'val': holder.val + 1}) %} -{% endset %}{% do __macro_modify_615470226_temp_variable_1__ %} +{% endset %}\ +{% do __macro_modify_615470226_temp_variable_1__ %} {% if holder.val >= 1 %} {{ i }} {% endif %} diff --git a/src/test/resources/eager/scopes-resetting-bindings.expected.jinja b/src/test/resources/eager/scopes-resetting-bindings.expected.jinja index 4c8f4b527..097e54f2d 100644 --- a/src/test/resources/eager/scopes-resetting-bindings.expected.jinja +++ b/src/test/resources/eager/scopes-resetting-bindings.expected.jinja @@ -1,4 +1,5 @@ -{% set my_list = [0] %}{% for i in deferred %} +{% set my_list = [0] %}\ +{% for i in deferred %} {% for j in deferred %} {% if deferred %} {% do my_list.append(1) %} diff --git a/src/test/resources/eager/sets-multiple-vars-deferred-in-child.expected.jinja b/src/test/resources/eager/sets-multiple-vars-deferred-in-child.expected.jinja index c961b64b1..5de8e1606 100644 --- a/src/test/resources/eager/sets-multiple-vars-deferred-in-child.expected.jinja +++ b/src/test/resources/eager/sets-multiple-vars-deferred-in-child.expected.jinja @@ -1,2 +1,8 @@ -1 & 2{% set bar = 2 %}{% set foo = 3 %}{% if deferred %}{% set bar = 4 %}{% else %}{% set foo = 5 %}{% endif %} +1 & 2{% set bar = 2 %}\ +{% set foo = 3 %}\ +{% if deferred %}\ +{% set bar = 4 %}\ +{% else %}\ +{% set foo = 5 %}\ +{% endif %} {{ foo }} & {{ bar }} diff --git a/src/test/resources/eager/uses-unique-macro-names.expected.jinja b/src/test/resources/eager/uses-unique-macro-names.expected.jinja index 9fce79651..fa1a2c30a 100644 --- a/src/test/resources/eager/uses-unique-macro-names.expected.jinja +++ b/src/test/resources/eager/uses-unique-macro-names.expected.jinja @@ -2,9 +2,15 @@ {% set __macro_foo_97643642_temp_variable_0__ %} Goodbye {{ myname }} -{% endset %}{% set a = filter:upper.filter(__macro_foo_97643642_temp_variable_0__, ____int3rpr3t3r____) %} -{% do %}{% set current_path = 'macro-with-filter.jinja' %} -{% set __macro_foo_927217348_temp_variable_0__ %}Hello {{ myname }}{% endset %}{% set b = filter:upper.filter(__macro_foo_927217348_temp_variable_0__, ____int3rpr3t3r____) %} -{% set current_path = '' %}{% enddo %} +{% endset %}\ +{% set a = filter:upper.filter(__macro_foo_97643642_temp_variable_0__, ____int3rpr3t3r____) %} +{% do %}\ +{% set current_path = 'macro-with-filter.jinja' %} +{% set __macro_foo_927217348_temp_variable_0__ %}\ +Hello {{ myname }}\ +{% endset %}\ +{% set b = filter:upper.filter(__macro_foo_927217348_temp_variable_0__, ____int3rpr3t3r____) %} +{% set current_path = '' %}\ +{% enddo %} {{ a }} {{ b }} diff --git a/src/test/resources/eager/wraps-certain-output-in-raw.expected.jinja b/src/test/resources/eager/wraps-certain-output-in-raw.expected.jinja index bbe220d27..9e748c22c 100644 --- a/src/test/resources/eager/wraps-certain-output-in-raw.expected.jinja +++ b/src/test/resources/eager/wraps-certain-output-in-raw.expected.jinja @@ -1,8 +1,20 @@ -{% raw %}{{ bar }}{% endraw %} -{% raw %}{{ bar }}{% endraw %} -{% raw %}{% print foo %}{% endraw %} -{% raw %}{% print foo %}{% endraw %} -{% raw %}{% baz %}{% endraw %} -{% raw %}{% baz %}{% endraw %} +{% raw %}\ +{{ bar }}\ +{% endraw %} +{% raw %}\ +{{ bar }}\ +{% endraw %} +{% raw %}\ +{% print foo %}\ +{% endraw %} +{% raw %}\ +{% print foo %}\ +{% endraw %} +{% raw %}\ +{% baz %}\ +{% endraw %} +{% raw %}\ +{% baz %}\ +{% endraw %} No raw No raw diff --git a/src/test/resources/tags/eager/extendstag/defers-block-in-extends-child.expected.jinja b/src/test/resources/tags/eager/extendstag/defers-block-in-extends-child.expected.jinja index 14644045c..3f49c19e6 100644 --- a/src/test/resources/tags/eager/extendstag/defers-block-in-extends-child.expected.jinja +++ b/src/test/resources/tags/eager/extendstag/defers-block-in-extends-child.expected.jinja @@ -1,8 +1,12 @@ -{% set current_path = '../eager/extendstag/base.html' %} +{% set current_path = '../eager/extendstag/base.html' %}\ +
-{% set temp_current_path_743889914 = current_path %}{% set current_path = '' %}

Table Of Contents

-{{ deferred }}{% set current_path = temp_current_path_743889914 %} +{% set temp_current_path_743889914 = current_path %}\ +{% set current_path = '' %}\ +

Table Of Contents

+{{ deferred }}\ +{% set current_path = temp_current_path_743889914 %}
diff --git a/src/test/resources/tags/eager/extendstag/defers-super-block-with-deferred.expected.jinja b/src/test/resources/tags/eager/extendstag/defers-super-block-with-deferred.expected.jinja index 5968f87e0..6da141a82 100644 --- a/src/test/resources/tags/eager/extendstag/defers-super-block-with-deferred.expected.jinja +++ b/src/test/resources/tags/eager/extendstag/defers-super-block-with-deferred.expected.jinja @@ -1,9 +1,13 @@ -{% set current_path = '../eager/extendstag/base-deferred.html' %} +{% set current_path = '../eager/extendstag/base-deferred.html' %}\ +
-{% set temp_current_path_743889914 = current_path %}{% set current_path = '' %}

Table Of Contents

+{% set temp_current_path_743889914 = current_path %}\ +{% set current_path = '' %}\ +

Table Of Contents

-

this is a {{ deferred }}.

+

this is a {{ deferred }}\ +.

{% set current_path = temp_current_path_743889914 %}
diff --git a/src/test/resources/tags/eager/extendstag/reconstructs-deferred-outside-block.expected.jinja b/src/test/resources/tags/eager/extendstag/reconstructs-deferred-outside-block.expected.jinja index 336d111a4..3b14097e4 100644 --- a/src/test/resources/tags/eager/extendstag/reconstructs-deferred-outside-block.expected.jinja +++ b/src/test/resources/tags/eager/extendstag/reconstructs-deferred-outside-block.expected.jinja @@ -3,11 +3,17 @@ {% set foo = 'yes' %} {% else %} {% set foo = 'no' %} -{% endif %}{% enddo %}{# End Label: ignored_output_from_extends #}{% set current_path = '../eager/extendstag/base.html' %} +{% endif %}\ +{% enddo %}\ +{# End Label: ignored_output_from_extends #}{% set current_path = '../eager/extendstag/base.html' %}\ +
-{% set temp_current_path_743889914 = current_path %}{% set current_path = '' %}

Table Of Contents

-

{{ foo }}.

{% set current_path = temp_current_path_743889914 %} +{% set temp_current_path_743889914 = current_path %}\ +{% set current_path = '' %}\ +

Table Of Contents

+

{{ foo }}\ +.

{% set current_path = temp_current_path_743889914 %}
diff --git a/src/test/resources/tags/eager/fortag/handles-nested-deferred-for-loop.expected.jinja b/src/test/resources/tags/eager/fortag/handles-nested-deferred-for-loop.expected.jinja index 9e53ab4fc..fd102d03e 100644 --- a/src/test/resources/tags/eager/fortag/handles-nested-deferred-for-loop.expected.jinja +++ b/src/test/resources/tags/eager/fortag/handles-nested-deferred-for-loop.expected.jinja @@ -1,13 +1,16 @@ {% for __ignored__ in [0] %} {% for bar in deferred %} -pastrami sandwich. {{ bar }}! +pastrami sandwich. {{ bar }}\ +! {% endfor %} {% for bar in deferred %} -pastrami salad. {{ bar }}! +pastrami salad. {{ bar }}\ +! {% endfor %} {% for bar in deferred %} -pastrami smoothie. {{ bar }}! +pastrami smoothie. {{ bar }}\ +! {% endfor %} {% endfor %} diff --git a/src/test/resources/tags/eager/iftag/handles-only-deferred-elif.expected.jinja b/src/test/resources/tags/eager/iftag/handles-only-deferred-elif.expected.jinja index a175246e0..ea47d3bd2 100644 --- a/src/test/resources/tags/eager/iftag/handles-only-deferred-elif.expected.jinja +++ b/src/test/resources/tags/eager/iftag/handles-only-deferred-elif.expected.jinja @@ -1,4 +1,5 @@ -{% if false %}{% elif deferred > 0 %} +{% if false %}\ +{% elif deferred > 0 %} Positive {{ deferred }} {% else %} Negative {{ deferred }} diff --git a/src/test/resources/tags/eager/includetag/includes-deferred.expected.jinja b/src/test/resources/tags/eager/includetag/includes-deferred.expected.jinja index 7431ee8c1..8d0a8632d 100644 --- a/src/test/resources/tags/eager/includetag/includes-deferred.expected.jinja +++ b/src/test/resources/tags/eager/includetag/includes-deferred.expected.jinja @@ -1,5 +1,7 @@ Foo begins as: abc -{% set current_path = 'sets-to-deferred.jinja' %}{% set foo = deferred %} -foo is now {{ deferred }}. +{% set current_path = 'sets-to-deferred.jinja' %}\ +{% set foo = deferred %} +foo is now {{ deferred }}\ +. {% set current_path = '' %} Foo ends as: {{ foo }} From 31234163fbb2a2a91621211a0b49be6fc3a7b847 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Fri, 6 Sep 2024 18:25:48 -0400 Subject: [PATCH 3/3] Prettify ExpectedNodeInterpreter --- .../jinjava/ExpectedNodeInterpreter.java | 19 ++++++++++++------- .../jinjava/ExpectedTemplateInterpreter.java | 4 ++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/test/java/com/hubspot/jinjava/ExpectedNodeInterpreter.java b/src/test/java/com/hubspot/jinjava/ExpectedNodeInterpreter.java index 404bbf41f..ca438fed1 100644 --- a/src/test/java/com/hubspot/jinjava/ExpectedNodeInterpreter.java +++ b/src/test/java/com/hubspot/jinjava/ExpectedNodeInterpreter.java @@ -26,7 +26,8 @@ public ExpectedNodeInterpreter(JinjavaInterpreter interpreter, Tag tag, String p public String assertExpectedOutput(String name) { TagNode tagNode = (TagNode) fixture(name); String output = tag.interpret(tagNode, interpreter); - assertThat(output.trim()).isEqualTo(expected(name).trim()); + assertThat(ExpectedTemplateInterpreter.prettify(output.trim())) + .isEqualTo(ExpectedTemplateInterpreter.prettify(expected(name).trim())); return output; } @@ -34,9 +35,11 @@ public Node fixture(String name) { try { return new TreeParser( interpreter, - Resources.toString( - Resources.getResource(String.format("%s/%s.jinja", path, name)), - StandardCharsets.UTF_8 + ExpectedTemplateInterpreter.simplify( + Resources.toString( + Resources.getResource(String.format("%s/%s.jinja", path, name)), + StandardCharsets.UTF_8 + ) ) ) .buildTree() @@ -49,9 +52,11 @@ public Node fixture(String name) { public String expected(String name) { try { - return Resources.toString( - Resources.getResource(String.format("%s/%s.expected.jinja", path, name)), - StandardCharsets.UTF_8 + return ExpectedTemplateInterpreter.simplify( + Resources.toString( + Resources.getResource(String.format("%s/%s.expected.jinja", path, name)), + StandardCharsets.UTF_8 + ) ); } catch (IOException e) { throw new RuntimeException(e); diff --git a/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java b/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java index 4c1cc4b23..7af7bd559 100644 --- a/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java +++ b/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java @@ -135,7 +135,7 @@ public String assertExpectedNonEagerOutput(String name) { return output; } - private String prettify(String string) { + static String prettify(String string) { return string.replaceAll("([}%]})([^\\s])", "$1\\\\\n$2"); } @@ -172,7 +172,7 @@ private String expected(String name) { } } - private String simplify(String prettified) { + static String simplify(String prettified) { return prettified.replaceAll("\\\\\n\\s*", ""); }