Merge pull request #540 from Himura2la/patch-1

Allow block style in multiline scalars with trailing spaces
aaubry · Nov 19, 2020 · 108c192 · 108c192
2 parents c4bd6c6 + 048b027
commit 108c192
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/YamlDotNet.Test/Core/EmitterTests.cs b/YamlDotNet.Test/Core/EmitterTests.cs
@@ -208,6 +208,19 @@ public void FoldedStyleIsSelectedWhenNewLinesAreFoundInLiteral()
             yaml.Should().Contain(">");
         }
 
+
+        [Fact]
+        [Trait("motive", "pr #540")]
+        public void AllowBlockStyleInMultilineScalarsWithTrailingSpaces()
+        {
+            var events = SequenceWith(Scalar("hello  \nworld").ImplicitPlain);
+
+            var yaml = EmittedTextFrom(StreamedDocumentWith(events));
+
+            yaml.Should().Contain("\n");
+        }
+
+
         [Fact]
         public void FoldedStyleDoesNotGenerateExtraLineBreaks()
         {

diff --git a/YamlDotNet/Core/Emitter.cs b/YamlDotNet/Core/Emitter.cs
@@ -319,11 +319,13 @@ private void AnalyzeScalar(Scalar scalar)
             var spaceBreak = false;
             var previousSpace = false;
             var previousBreak = false;
+            var lineOfSpaces = false;
 
             var lineBreaks = false;
 
             var specialCharacters = !ValueIsRepresentableInOutputEncoding(value);
             var singleQuotes = false;
+            var linesOfSpaces = false;
 
             var isFirst = true;
             while (!buffer.EndOfInput)
@@ -403,6 +405,7 @@ private void AnalyzeScalar(Scalar scalar)
                     if (previousBreak)
                     {
                         breakSpace = true;
+                        lineOfSpaces = true;
                     }
 
                     previousSpace = true;
@@ -425,13 +428,19 @@ private void AnalyzeScalar(Scalar scalar)
                         spaceBreak = true;
                     }
 
+                    if (lineOfSpaces)
+                    {
+                        linesOfSpaces = true;
+                    }
+
                     previousSpace = false;
                     previousBreak = true;
                 }
                 else
                 {
                     previousSpace = false;
                     previousBreak = false;
+                    lineOfSpaces = false;
                 }
 
                 preceededByWhitespace = buffer.IsWhiteBreakOrZero();
@@ -472,6 +481,9 @@ private void AnalyzeScalar(Scalar scalar)
                 scalarData.isFlowPlainAllowed = false;
                 scalarData.isBlockPlainAllowed = false;
                 scalarData.isSingleQuotedAllowed = false;
+            }
+            if (linesOfSpaces)
+            {
                 scalarData.isBlockAllowed = false;
             }