Merge pull request #814 from YihaoOct/yihao/fix-comments

Fix Emitter to handle comments between a mapping key and a mapping/sequence value +semver:fix
aaubry · Jun 17, 2023 · 6f1e8dc · 6f1e8dc
2 parents 9a5900f + dd02557
commit 6f1e8dc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/YamlDotNet.Test/Core/EmitterTests.cs b/YamlDotNet.Test/Core/EmitterTests.cs
@@ -296,6 +296,28 @@ public void CommentsAreEmittedCorrectly()
                 .And.Contain("# Bottom comment");
         }
 
+        [Fact]
+        public void CommentsBetweenMappingKeyAndValueAreEmittedCorrectly()
+        {
+            var events = MappingWith(
+                Scalar("key").ImplicitPlain,
+                InlineComment("inline comment"),
+                StandaloneComment("standalone comment"),
+                BlockSequenceStart,
+                Scalar("value").ImplicitPlain,
+                SequenceEnd
+            );
+
+            var yaml = EmittedTextFrom(StreamedDocumentWith(events));
+
+            yaml.Should()
+                .Contain(Lines(
+                    "key: # inline comment",
+                    "# standalone comment",
+                    "  - value"
+                ));
+        }
+
         [Fact]
         public void ACommentAsTheFirstEventAddsANewLine()
         {

diff --git a/YamlDotNet/Core/Emitter.cs b/YamlDotNet/Core/Emitter.cs
@@ -1638,6 +1638,7 @@ private void EmitBlockMappingKey(ParsingEvent evt, bool isFirst)
             {
                 states.Push(EmitterState.BlockMappingSimpleValue);
                 EmitNode(evt, true, true);
+                WriteIndicator(":", false, false, false);
             }
             else
             {
@@ -1652,11 +1653,7 @@ private void EmitBlockMappingKey(ParsingEvent evt, bool isFirst)
         /// </summary>
         private void EmitBlockMappingValue(ParsingEvent evt, bool isSimple)
         {
-            if (isSimple)
-            {
-                WriteIndicator(":", false, false, false);
-            }
-            else
+            if (!isSimple)
             {
                 WriteIndent();
                 WriteIndicator(":", true, false, true);