fix: escaped double-quotes in helper string arguments (issue #584)

source/Handlebars.Test/IssueTests.cs

@@ -734,6 +734,35 @@ public void UnrecognisedExpressionThrowsOutOfMemoryException()
  Assert.Throws<HandlebarsCompilerException>(()=> Handlebars.Compile(source));
  }
 
+ // Issue: https://github.com/Handlebars-Net/Handlebars.Net/issues/584
+ [Fact]
+ public void Issue584_EscapedDoubleQuoteInHelperStringArgument()
+ {
+ var handlebars = Handlebars.Create();
+ handlebars.RegisterHelper("myHelper", (writer, context, args) =>
+ {
+ writer.WriteSafeString(args[0]?.ToString() + "|" + args[1]?.ToString());
+ });
+
+ // Double-quoted string arg with escaped double-quote inside
+ var template = handlebars.Compile("{{myHelper name \"hello \\\"world\\\"\"}}");
+ var data = new { name = "test" };
+ var result = template(data);
+ Assert.Equal("test|hello \"world\"", result);
+ }
+
+ // Issue: https://github.com/Handlebars-Net/Handlebars.Net/issues/584
+ [Fact]
+ public void Issue584_SingleQuoteStringArgStillWorks()
+ {
+ var handlebars = Handlebars.Create();
+ handlebars.RegisterHelper("myHelper", (context, args) => args[0]?.ToString());
+
+ var template = handlebars.Compile("{{myHelper 'hello world'}}");
+ var result = template(new { });
+ Assert.Equal("hello world", result);
+ }
+
  // Issue: https://github.com/Handlebars-Net/Handlebars.Net/issues/466
  // Dictionary keys were inaccessible in nested #each when data is a mix of Dictionary and List
  [Fact]

source/Handlebars/Compiler/Lexer/Parsers/LiteralParser.cs

@@ -36,7 +36,7 @@
  return char.IsDigit(peek) || peek == '-';
  }
 
  private static string AccumulateLiteral(ExtendedStringReader reader, bool captureDelimiter, params char[] delimiters)
  {
  using(var container = StringBuilderPool.Shared.Use())
  {
@@ -49,6 +49,28 @@
  throw new HandlebarsParserException("Reached end of template before the expression was closed.", reader.GetContext());
  }
 
+ // Handle escape sequences inside delimited literals (e.g. \" inside "...")
+ if (captureDelimiter && (char)node == '\\')
+ {
+ reader.Read(); // consume the backslash
+ var next = reader.Peek();
+ if (next == -1)
+ {
+ throw new HandlebarsParserException("Reached end of template before the expression was closed.", reader.GetContext());
+ }
+ var nextChar = (char)next;
+ // If the escaped character is one of the delimiters, emit the raw char
+ if (delimiters.Contains(nextChar))
+ {
+ reader.Read();
+ buffer.Append(nextChar);
+ continue;
+ }
+ // Otherwise keep the backslash and let the next iteration handle the char
+ buffer.Append('\\');
+ continue;
+ }
+
  if (delimiters.Contains((char)node))
  {
  if (captureDelimiter)
@@ -65,7 +87,7 @@
 
  buffer.Append((char)reader.Read());
  }
-
+
  return buffer.ToString();
  }
  }