From 0ecb0933903dbc3874f75963f893d77a09bd8367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Mon, 3 May 2021 17:26:31 -0700 Subject: [PATCH] Update Parlot (#335) --- Fluid.Tests/ParserTests.cs | 15 +++++++++++---- Fluid/Fluid.csproj | 2 +- Fluid/Parser/TagParsers.cs | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Fluid.Tests/ParserTests.cs b/Fluid.Tests/ParserTests.cs index a4640714..f70e26bf 100644 --- a/Fluid.Tests/ParserTests.cs +++ b/Fluid.Tests/ParserTests.cs @@ -517,13 +517,20 @@ public void StringsCanContainCurlies(string source, string expected) [Fact] public void ShouldSkipNewLines() { - var source = @"{%if true - and - true%}true{%endif%}"; + var source = @"{% +if +true +or +false +-%} +true +{%- +endif +%}"; var result = _parser.TryParse(source, out var template, out var errors); - Assert.True(result); + Assert.True(result, errors); Assert.NotNull(template); Assert.Null(errors); diff --git a/Fluid/Fluid.csproj b/Fluid/Fluid.csproj index 6ffdf710..9049e7fc 100644 --- a/Fluid/Fluid.csproj +++ b/Fluid/Fluid.csproj @@ -10,7 +10,7 @@ - + diff --git a/Fluid/Parser/TagParsers.cs b/Fluid/Parser/TagParsers.cs index c58df7f8..9ba00e87 100644 --- a/Fluid/Parser/TagParsers.cs +++ b/Fluid/Parser/TagParsers.cs @@ -49,7 +49,7 @@ public override bool Parse(ParseContext context, ref ParseResult resu { if (_skipWhiteSpace) { - context.Scanner.SkipWhiteSpace(); + context.SkipWhiteSpace(); } var start = context.Scanner.Cursor.Position; @@ -96,7 +96,7 @@ public override bool Parse(ParseContext context, ref ParseResult resu { if (_skipWhiteSpace) { - context.Scanner.SkipWhiteSpace(); + context.SkipWhiteSpace(); } var start = context.Scanner.Cursor.Position;