Fix multiline sets and strings (#85)

mitsuhiko · Sep 1, 2022 · 858b8e1 · 858b8e1
1 parent 6cd21be
commit 858b8e1
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/minijinja/src/lexer.rs b/minijinja/src/lexer.rs
@@ -124,7 +124,7 @@ fn tokenize_raw(
                         has_escapes = true;
                         true
                     }
-                    (_, $delim) | (_, b'\r') | (_, b'\n') => false,
+                    (_, $delim) => false,
                     _ => true,
                 })
                 .count();

diff --git a/minijinja/tests/inputs/escape.txt b/minijinja/tests/inputs/escape.txt
@@ -5,4 +5,8 @@
 {{'\'' ~ 'foo'}}
 {{'\'' ~ x ~ '\''}}
 {{"\'" ~ x ~ '\''}}
-{{"\'" ~ x ~ '\''}}
+{{"\'" ~ x ~ '\''}}
+{{"
+hello world"}}
+{{"hello
+world"}}
diff --git a/minijinja/tests/inputs/set.txt b/minijinja/tests/inputs/set.txt
@@ -21,4 +21,15 @@ Into Loop:
 
 Conditional:
 {% if true %}{% set foo = "was true" %}{% endif %}
-{{ foo }}
+{{ foo }}
+
+Multiline:
+{% set multiline = "
+hello
+world" %}
+{{ multiline }}
+
+Multiline:
+{% set multiline = "hello
+world" %}
+{{ multiline }}
diff --git a/minijinja/tests/snapshots/test_templates__vm@escape.txt.snap b/minijinja/tests/snapshots/test_templates__vm@escape.txt.snap
@@ -8,3 +8,7 @@ input_file: minijinja/tests/inputs/escape.txt
 'hello'
 'hello'
 
+hello world
+hello
+world
+
diff --git a/minijinja/tests/snapshots/test_templates__vm@set.txt.snap b/minijinja/tests/snapshots/test_templates__vm@set.txt.snap
@@ -32,3 +32,14 @@ Conditional:
 
 was true
 
+Multiline:
+
+
+hello
+world
+
+Multiline:
+
+hello
+world
+