Merge pull request #187 from aaubry/Archanian-issue-135-single-quote-…

…serialization-error Archanian issue 135 single quote serialization error
aaubry · Jun 29, 2016 · 5dbf200 · 5dbf200
2 parents 1befe05 + 804adfd
commit 5dbf200
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/YamlDotNet.Test/Core/EmitterTests.cs b/YamlDotNet.Test/Core/EmitterTests.cs
@@ -352,6 +352,31 @@ public void NewLinesAreNotDuplicatedWhenEmitted(string input, string expected)
                 StreamEnd);
         }
 
+        [Theory]
+        [InlineData("'.'test")]
+        [InlineData("'")]
+        [InlineData("'.'")]
+        [InlineData("'test")]
+        [InlineData("'test'")]
+        public void SingleQuotesAreDoubleQuoted(string input)
+        {
+            var events = StreamOf(DocumentWith(new Scalar(input)));
+            var yaml = EmittedTextFrom(events);
+
+            string expected = string.Format("\"{0}\"", input);
+
+            yaml.Should().Contain(expected);
+        }
+
+        [Theory]
+        [InlineData("hello\n'world")]
+        public void SingleQuotesAreNotDoubleQuotedUnlessNecessary(string input)
+        {
+            var events = StreamOf(DocumentWith(new Scalar(input)));
+            var yaml = EmittedTextFrom(events);
+            yaml.Should().NotContain("\"");
+        }
+
         private string Lines(params string[] lines)
         {
             return string.Join(Environment.NewLine, lines);

diff --git a/YamlDotNet/Core/Emitter.cs b/YamlDotNet/Core/Emitter.cs
@@ -93,6 +93,7 @@ private class ScalarData
             public bool isBlockPlainAllowed;
             public bool isSingleQuotedAllowed;
             public bool isBlockAllowed;
+            public bool hasSingleQuotes;
             public ScalarStyle style;
         }
 
@@ -325,6 +326,7 @@ private void AnalyzeScalar(Scalar scalar)
             var leadingBreak = false;
             var trailingSpace = false;
             var trailingBreak = false;
+            var leadingQuote = false;
 
             var breakSpace = false;
             var spaceBreak = false;
@@ -334,23 +336,28 @@ private void AnalyzeScalar(Scalar scalar)
             var lineBreaks = false;
 
             var specialCharacters = !ValueIsRepresentableInOutputEncoding(value);
+            var singleQuotes = false;
 
             var isFirst = true;
             while (!buffer.EndOfInput)
             {
                 if (isFirst)
                 {
-                    if (buffer.Check(@"#,[]{}&*!|>\""%@`"))
+                    if (buffer.Check(@"#,[]{}&*!|>\""%@`'"))
                     {
                         flowIndicators = true;
                         blockIndicators = true;
+                        leadingQuote = buffer.Check('\'');
+                        singleQuotes |= buffer.Check('\'');
                     }
 
                     if (buffer.Check("?:"))
                     {
                         flowIndicators = true;
                         if (followedByWhitespace)
+                        {
                             blockIndicators = true;
+                        }
                     }
 
                     if (buffer.Check('-') && followedByWhitespace)
@@ -380,6 +387,8 @@ private void AnalyzeScalar(Scalar scalar)
                         flowIndicators = true;
                         blockIndicators = true;
                     }
+
+                    singleQuotes |= buffer.Check('\'');
                 }
 
                 if (!specialCharacters && !buffer.IsPrintable())
@@ -453,7 +462,7 @@ private void AnalyzeScalar(Scalar scalar)
             scalarData.isSingleQuotedAllowed = true;
             scalarData.isBlockAllowed = true;
 
-            if (leadingSpace || leadingBreak || trailingSpace || trailingBreak)
+            if (leadingSpace || leadingBreak || trailingSpace || trailingBreak || leadingQuote)
             {
                 scalarData.isFlowPlainAllowed = false;
                 scalarData.isBlockPlainAllowed = false;
@@ -478,7 +487,7 @@ private void AnalyzeScalar(Scalar scalar)
                 scalarData.isSingleQuotedAllowed = false;
                 scalarData.isBlockAllowed = false;
             }
-
+            
             scalarData.isMultiline = lineBreaks;
             if (lineBreaks)
             {
@@ -487,10 +496,16 @@ private void AnalyzeScalar(Scalar scalar)
             }
 
             if (flowIndicators)
+            {
                 scalarData.isFlowPlainAllowed = false;
+            }
 
             if (blockIndicators)
+            {
                 scalarData.isBlockPlainAllowed = false;
+            }
+
+            scalarData.hasSingleQuotes = singleQuotes;
         }
 
         private bool ValueIsRepresentableInOutputEncoding(string value)
@@ -890,7 +905,7 @@ private void SelectScalarStyle(ParsingEvent evt)
             {
                 if ((flowLevel != 0 && !scalarData.isFlowPlainAllowed) || (flowLevel == 0 && !scalarData.isBlockPlainAllowed))
                 {
-                    style = ScalarStyle.SingleQuoted;
+                    style = (scalarData.isSingleQuotedAllowed && !scalarData.hasSingleQuotes) ? ScalarStyle.SingleQuoted : ScalarStyle.DoubleQuoted;
                 }
                 if (string.IsNullOrEmpty(scalarData.value) && (flowLevel != 0 || isSimpleKeyContext))
                 {