Merge pull request #964 from EdwardCooke/ec-mappingwithanchor

Fix single element with anchor inline mapping
aaubry · Sep 1, 2024 · 62b7f59 · 62b7f59
2 parents 5240bf7 + 22fac65
commit 62b7f59
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/YamlDotNet.Test/Core/EventsHelper.cs b/YamlDotNet.Test/Core/EventsHelper.cs
@@ -87,6 +87,11 @@ protected ScalarBuilder PlainScalar(string text)
             return new ScalarBuilder(text, ScalarStyle.Plain);
         }
 
+        protected ScalarBuilder PlainScalar(string text, AnchorName anchor)
+        {
+            return new ScalarBuilder(text, ScalarStyle.Plain, anchor);
+        }
+
         protected ScalarBuilder SingleQuotedScalar(string text)
         {
             return new ScalarBuilder(text, ScalarStyle.SingleQuoted);
@@ -159,12 +164,19 @@ protected Comment InlineComment(string value)
 
         protected class ScalarBuilder
         {
+            private readonly AnchorName anchor = AnchorName.Empty;
             private readonly string text;
             private readonly ScalarStyle style;
             private string tag;
             private bool plainImplicit;
             private bool quotedImplicit;
 
+            public ScalarBuilder(string text, ScalarStyle style, AnchorName anchor)
+                : this(text, style)
+            {
+                this.anchor = anchor;
+            }
+
             public ScalarBuilder(string text, ScalarStyle style)
             {
                 this.text = text;
@@ -202,7 +214,7 @@ public ScalarBuilder ImplicitQuoted
 
             public static implicit operator Scalar(ScalarBuilder builder)
             {
-                return new Scalar(AnchorName.Empty,
+                return new Scalar(builder.anchor,
                     builder.tag,
                     builder.text,
                     builder.style,

diff --git a/YamlDotNet.Test/Core/ParserTests.cs b/YamlDotNet.Test/Core/ParserTests.cs
@@ -455,5 +455,19 @@ public void NewLinesAreParsedAccordingToTheSpecification(string yaml, string exp
                 DocumentEnd(Implicit),
                 StreamEnd);
         }
+
+        [Fact]
+        public void SingleElementeWithAnchorInlineMapping()
+        {
+            AssertSequenceOfEventsFrom(Yaml.ParserForText(@"{ key: &value value }"),
+                StreamStart,
+                DocumentStart(Implicit),
+                FlowMappingStart,
+                PlainScalar("key"),
+                PlainScalar("value", "value"),
+                MappingEnd,
+                DocumentEnd(Implicit),
+                StreamEnd);
+        }
     }
 }
diff --git a/YamlDotNet/Core/Parser.cs b/YamlDotNet/Core/Parser.cs
@@ -575,9 +575,8 @@ private ParsingEvent ParseNode(bool isBlock, bool isIndentlessSequence)
                     }
 
                     // Read next token to ensure the error case spec test 'T833':
-                    // "Flow mapping missing a separating comma".
 
-                    if (state == ParserState.FlowMappingKey && scanner.MoveNextWithoutConsuming())
+                    if (state == ParserState.FlowMappingKey && !(scanner.Current is FlowMappingEnd) && scanner.MoveNextWithoutConsuming())
                     {
                         currentToken = scanner.Current;
                         if (currentToken != null && !(currentToken is FlowEntry) && !(currentToken is FlowMappingEnd))