Update Parlot (#335)

sebastienros · May 4, 2021 · 0ecb093 · 0ecb093
1 parent 8f86a6a
commit 0ecb093
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git 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
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Parlot" Version="0.0.15" />
+    <PackageReference Include="Parlot" Version="0.0.17" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="1.1.1" />
     <PackageReference Include="TimeZoneConverter" Version="3.3.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />

diff --git a/Fluid/Parser/TagParsers.cs b/Fluid/Parser/TagParsers.cs
@@ -49,7 +49,7 @@ public override bool Parse(ParseContext context, ref ParseResult<TagResult> 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<TagResult> resu
             {
                 if (_skipWhiteSpace)
                 {
-                    context.Scanner.SkipWhiteSpace();
+                    context.SkipWhiteSpace();
                 }
 
                 var start = context.Scanner.Cursor.Position;