Added support for newlines in string literals

jknack · May 13, 2021 · 223f0d9 · 223f0d9
1 parent 1d44be3
commit 223f0d9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/handlebars/src/main/antlr4/com/github/jknack/handlebars/internal/HbsLexer.g4 b/handlebars/src/main/antlr4/com/github/jknack/handlebars/internal/HbsLexer.g4
@@ -271,12 +271,12 @@ PIPE
 
 DOUBLE_STRING
   :
-    '"' ( '\\"' | ~[\n] )*? '"'
+    '"' ( '\\"' | . )*? '"'
   ;
 
 SINGLE_STRING
   :
-    '\'' ( '\\\'' | ~[\n] )*? '\''
+    '\'' ( '\\\'' | . )*? '\''
   ;
 
 EQ

diff --git a/handlebars/src/test/java/handlebarsjs/spec/StringLiteralParametersTest.java b/handlebars/src/test/java/handlebarsjs/spec/StringLiteralParametersTest.java
@@ -84,4 +84,29 @@ public Object apply(final String cruel, final Options options) throws IOExceptio
         "block helpers with multiple params");
   }
 
+  @Test
+  public void usingNewlinesInDoubleStringIsAllowed() throws IOException {
+    String string = "Message: {{{hello \"before\" \"multi\nline\" \"after\"}}}";
+    Hash helpers = $("hello", new Helper<String>() {
+      @Override
+      public Object apply(final String param, final Options options) throws IOException {
+        return "Hello " + param + " " + options.param(0) + " " + options.param(1);
+      }
+    });
+    shouldCompileTo(string, $, helpers, "Message: Hello before multi\nline after",
+            "template with an escaped String literal");
+  }
+
+  @Test
+  public void usingNewlinesInSingleStringIsAllowed() throws IOException {
+    String string = "Message: {{{hello 'before' 'multi\nline' 'after' }}}";
+    Hash helpers = $("hello", new Helper<String>() {
+      @Override
+      public Object apply(final String param, final Options options) throws IOException {
+        return "Hello " + param + " " + options.param(0) + " " + options.param(1);
+      }
+    });
+    shouldCompileTo(string, $, helpers, "Message: Hello before multi\nline after",
+            "template with an escaped String literal");
+  }
 }