Merge pull request #6581 from Gillibald/fixes/6577

Fixes PathMarkupParser flag parsing when no separator is used
AvaloniaUI · Sep 23, 2021 · 2c6a820 · 2c6a820
2 parents 2618b83 + b188cff
commit 2c6a820
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/Avalonia.Visuals/Media/PathMarkupParser.cs b/src/Avalonia.Visuals/Media/PathMarkupParser.cs
@@ -496,12 +496,18 @@ private static ReadOnlySpan<char> SkipWhitespace(ReadOnlySpan<char> span)
 
         private bool ReadBool(ref ReadOnlySpan<char> span)
         {
-            if (!ReadArgument(ref span, out var boolValue) || boolValue.Length != 1)
+            span = SkipWhitespace(span);
+
+            if (span.IsEmpty)
             {
                 throw new InvalidDataException("Invalid bool rule.");
             }
 
-            switch (boolValue[0])
+            var c = span[0];
+
+            span = span.Slice(1);
+
+            switch (c)
             {
                 case '0':
                     return false;

diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs
@@ -297,5 +297,28 @@ public void CloseFigure_Should_Move_CurrentPoint_To_CreateFigurePoint()
                 Assert.Equal(new Point(20, 20), figure.StartPoint);
             }
         }
+
+        [Fact]
+        public void Should_Parse_Flags_Without_Separator()
+        {
+            var pathGeometry = new PathGeometry();
+            using (var context = new PathGeometryContext(pathGeometry))
+            using (var parser = new PathMarkupParser(context))
+            {
+                parser.Parse("a.898.898 0 01.27.188");
+
+                var figure = pathGeometry.Figures[0];
+
+                var segments = figure.Segments;
+
+                Assert.NotNull(segments);
+
+                Assert.Equal(1, segments.Count);
+
+                var arcSegment = segments[0];
+
+                Assert.IsType<ArcSegment>(arcSegment);
+            }
+        }
     }
 }