Allow literal newlines etc. in string content

Author: nblumhardt

src/Serilog.Expressions/Expressions/Parsing/ExpressionTextParsers.cs

@@ -10,24 +10,24 @@ static class ExpressionTextParsers
         static readonly TextParser<ExpressionToken> GreaterOrEqual = Span.EqualTo(">=").Value(ExpressionToken.GreaterThanOrEqual);
         static readonly TextParser<ExpressionToken> NotEqual = Span.EqualTo("<>").Value(ExpressionToken.NotEqual);
 
-        public static TextParser<ExpressionToken> CompoundOperator = GreaterOrEqual.Or(LessOrEqual.Try().Or(NotEqual));
+        public static readonly TextParser<ExpressionToken> CompoundOperator = GreaterOrEqual.Or(LessOrEqual.Try().Or(NotEqual));
 
-        public static TextParser<string> HexInteger =
+        public static readonly TextParser<string> HexInteger =
             Span.EqualTo("0x")
                 .IgnoreThen(Character.Digit.Or(Character.Matching(ch => ch >= 'a' && ch <= 'f' || ch >= 'A' && ch <= 'F', "a-f"))
                     .Named("hex digit")
                     .AtLeastOnce())
                 .Select(chars => new string(chars));
 
-        public static TextParser<char> StringContentChar =
-            Span.EqualTo("''").Value('\'').Try().Or(Character.ExceptIn('\'', '\r', '\n'));
+        static readonly TextParser<char> StringContentChar =
+            Span.EqualTo("''").Value('\'').Try().Or(Character.AnyChar);
 
-        public static TextParser<string> String =
+        public static readonly TextParser<string> String =
             Character.EqualTo('\'')
                 .IgnoreThen(StringContentChar.Many())
                 .Then(s => Character.EqualTo('\'').Value(new string(s)));
 
-        public static TextParser<TextSpan> Real =
+        public static readonly TextParser<TextSpan> Real =
             Numerics.Integer
                 .Then(n => Character.EqualTo('.').IgnoreThen(Numerics.Integer).OptionalOrDefault()
                     .Select(f => f == TextSpan.None ? n : new TextSpan(n.Source, n.Position, n.Length + f.Length + 1)));

test/Serilog.Expressions.Tests/ExpressionParserTests.cs

@@ -39,6 +39,7 @@ public class ExpressionParserTests
         [InlineData("@Level in ['Error', 'Warning']", "_Internal_In(@Level,[@\"Error\",@\"Warning\"])")]
         [InlineData("5 not in [1, 2]", "_Internal_NotIn(5,[1,2])")]
         [InlineData("1+1", "Add(1,1)")]
+        [InlineData("'te\nst'", null)]
         public void ValidSyntaxIsAccepted(string input, string expected = null)
         {
             var roundTrip = ExpressionParser.Parse(input).ToString();