Merge remote-tracking branch 'kohlschuetter/ck/LiquidParserMatchEmpty…

…String' into feature/single_config
bkiers · Jul 29, 2023 · 5ee8191 · 5ee8191
2 parents 2d65a3b + edc1d9d
commit 5ee8191
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/antlr4/liquid/parser/v4/LiquidParser.g4 b/src/main/antlr4/liquid/parser/v4/LiquidParser.g4
@@ -217,13 +217,13 @@ jekyll_include_params
  ;
 
 output
- : {evaluateInOutputTag}? outStart evaluate=expr filter* OutEnd
+ : {isEvaluateInOutputTag()}? outStart evaluate=expr filter* OutEnd
  | {isStrict()}? outStart term filter* OutEnd
  | {isWarn() || isLax()}? outStart term filter* unparsed=not_out_end? OutEnd
  ;
 
 not_out_end
- : ~( OutEnd )*
+ : ( ~OutEnd )+
  ;
 
 filter

diff --git a/src/test/java/liqp/parser/v4/LiquidParserTest.java b/src/test/java/liqp/parser/v4/LiquidParserTest.java
@@ -387,12 +387,12 @@ public void testOutput() {
 
         assertThat(
                 texts("{{ true }}", "output"),
-                equalTo(array("{{", "true", "", "}}"))
+                equalTo(array("{{", "true", "}}"))
         );
 
         assertThat(
                 texts("{{ 'some string here' | uppercase }}", "output"),
-                equalTo(array("{{", "'some string here'", "|uppercase", "", "}}"))
+                equalTo(array("{{", "'some string here'", "|uppercase", "}}"))
         );
     }