Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />

<!-- Common to all TFMs -->
<PackageVersion Include="Parlot" Version="1.4.0" />
<PackageVersion Include="TimeZoneConverter" Version="7.0.0" />
<PackageVersion Include="Parlot" Version="1.5.2" />
<PackageVersion Include="TimeZoneConverter" Version="7.2.0" />

<!-- Benchmarks -->
<PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
<PackageVersion Include="BenchmarkDotNet" Version="0.15.5" />
<PackageVersion Include="DotLiquid" Version="2.3.197" />
<PackageVersion Include="Liquid.NET" Version="0.10.0" />
<PackageVersion Include="Scriban" Version="6.2.1" />
<PackageVersion Include="Scriban" Version="6.5.0" />
<PackageVersion Include="Handlebars.Net" Version="2.1.6" />

<!-- Testing -->
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
<PackageVersion Include="xunit.analyzers" Version="1.22.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="xunit.analyzers" Version="1.25.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Fluid/FluidParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ public class FluidParser
protected static readonly Parser<TagResult> InlineTagEnd = TagParsers.TagEnd();

protected static readonly Parser<TagResult> NoInlineOutputStart = NonInlineLiquidTagParsers.OutputTagStart();
protected static readonly Parser<TagResult> NoInlineOutputEnd = Literals.AnyOf(WhiteSpaceChars, minSize: 0).SkipAnd(NonInlineLiquidTagParsers.OutputTagEnd());
protected static readonly Parser<TagResult> NoInlineOutputEnd = Literals.AnyOf(WhiteSpaceChars.AsSpan(), minSize: 0).SkipAnd(NonInlineLiquidTagParsers.OutputTagEnd());
protected static readonly Parser<TagResult> NoInlineTagStart = NonInlineLiquidTagParsers.TagStart();
protected static readonly Parser<TagResult> NoInlineTagEnd = Literals.AnyOf(WhiteSpaceChars, minSize: 0).SkipAnd(NonInlineLiquidTagParsers.TagEnd());
protected static readonly Parser<TagResult> NoInlineTagEnd = Literals.AnyOf(WhiteSpaceChars.AsSpan(), minSize: 0).SkipAnd(NonInlineLiquidTagParsers.TagEnd());

protected readonly Parser<TagResult> OutputStart = InlineOutputStart;
protected readonly Parser<TagResult> OutputEnd = InlineOutputEnd;
Expand Down Expand Up @@ -192,7 +192,7 @@ public FluidParser(FluidParserOptions parserOptions)

// Seek anything that looks like a binary operator (==, !=, <, >, <=, >=, contains, startswith, endswith) then validates it with the registered operators
// An "identifier" operator should always be followed by a space so we ensure it's doing it with AndSkip(Literals.WhiteSpace())
CombinatoryExpression = Primary.And(ZeroOrOne(OneOf(Terms.AnyOf("=!<>", maxSize: 2), Terms.Identifier().AndSkip(Literals.WhiteSpace())).Then(x => x.ToString())
CombinatoryExpression = Primary.And(ZeroOrOne(OneOf(Terms.AnyOf("=!<>".AsSpan(), maxSize: 2), Terms.Identifier().AndSkip(Literals.WhiteSpace())).Then(x => x.ToString())
.When((ctx, s) => RegisteredOperators.ContainsKey(s)).And(Primary)))
.Then(x =>
{
Expand Down