Merge branch 'master' into patch-1

Handlebars-Net · Apr 1, 2024 · 435296b · 435296b
2 parents 667b081 + dd9c16f
commit 435296b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/source/Handlebars.Test/ExceptionTests.cs b/source/Handlebars.Test/ExceptionTests.cs
@@ -57,5 +57,14 @@ public void TestLooseClosingBlockInIteratorExpressionException()
                 Handlebars.Compile("{{#each enumerateMe}}test{{/if}}{{/each}}")(data);
             });
         }
+
+        [Fact]
+        public void TestNonClosingIgnoreBlockException()
+        {
+            Assert.Throws<HandlebarsParserException>(() =>
+            {
+                Handlebars.Compile("{{ [test }}")(new { });
+            });
+        }
    }
 }
diff --git a/source/Handlebars/Compiler/Lexer/Parsers/WordParser.cs b/source/Handlebars/Compiler/Lexer/Parsers/WordParser.cs
@@ -44,16 +44,7 @@ private static string AccumulateWord(ExtendedStringReader reader)
 
             while (true)
             {
-                if (isEscaped)
-                {
-                    var c = (char) reader.Read();
-                    if (c == ']') isEscaped = false;
-
-                    buffer.Append(c);
-                    continue;
-                }
-
-                if (!inString)
+                if (!inString && !isEscaped)
                 {
                     var peek = (char) reader.Peek();
 
@@ -70,6 +61,15 @@ private static string AccumulateWord(ExtendedStringReader reader)
                     throw new HandlebarsParserException("Reached end of template before the expression was closed.", reader.GetContext());
                 }
 
+                if (isEscaped)
+                {
+                    var c = (char) node;
+                    if (c == ']') isEscaped = false;
+
+                    buffer.Append(c);
+                    continue;
+                }
+
                 if (node == '[' && !inString)
                 {
                     isEscaped = true;