Merge pull request #778 from rutger-dijkstra/fix-block-level-quoted-strings

Quoted scalars are flow scalars only if flowLevel > 0

+semver:fix

Author: EdwardCooke

YamlDotNet.Test/Core/ScannerTests.cs

@@ -443,6 +443,93 @@ public void Plain_Scalar_inside_flow_does_not_allow_braces()
                 Error("Invalid key indicator format."));
         }
 
+        [Fact]
+        public void Keys_can_start_with_colons_in_nested_block()
+        {
+           AssertSequenceOfTokensFrom(Yaml.ScannerForText("root:\n  :first: 1\n  :second: 2"),
+                StreamStart,
+                BlockMappingStart,
+                Key,
+                PlainScalar("root"),
+                Value,
+                BlockMappingStart,
+                Key,
+                PlainScalar(":first"),
+                Value,
+                PlainScalar("1"),
+                Key,
+                PlainScalar(":second"),
+                Value,
+                PlainScalar("2"),
+                BlockEnd,
+                BlockEnd,
+                StreamEnd);
+        }
+
+        [Fact]
+        public void Keys_can_start_with_colons_after_quoted_values() 
+        {
+           AssertSequenceOfTokensFrom(Yaml.ScannerForText(":first: '1'\n:second: 2"),
+                StreamStart,
+                BlockMappingStart,
+                Key,
+                PlainScalar(":first"),
+                Value,
+                SingleQuotedScalar("1"),
+                Key,
+                PlainScalar(":second"),
+                Value,
+                PlainScalar("2"),
+                BlockEnd,
+                StreamEnd);
+        }
+
+        [Fact]
+        public void Keys_can_start_with_colons_after_single_quoted_values_in_nested_block() 
+        {
+           AssertSequenceOfTokensFrom(Yaml.ScannerForText("xyz:\n  :hello: 'world'\n  :goodbye: world"),
+                StreamStart,
+                BlockMappingStart,
+                Key,
+                PlainScalar("xyz"),
+                Value,
+                BlockMappingStart,
+                Key,
+                PlainScalar(":hello"),
+                Value,
+                SingleQuotedScalar("world"),
+                Key,
+                PlainScalar(":goodbye"),
+                Value,
+                PlainScalar("world"),
+                BlockEnd,
+                BlockEnd,
+                StreamEnd);
+        }
+
+        [Fact]
+        public void Keys_can_start_with_colons_after_double_quoted_values_in_nested_block() 
+        {
+           AssertSequenceOfTokensFrom(Yaml.ScannerForText("xyz:\n  :hello: \"world\"\n  :goodbye: world"),
+                StreamStart,
+                BlockMappingStart,
+                Key,
+                PlainScalar("xyz"),
+                Value,
+                BlockMappingStart,
+                Key,
+                PlainScalar(":hello"),
+                Value,
+                DoubleQuotedScalar("world"),
+                Key,
+                PlainScalar(":goodbye"),
+                Value,
+                PlainScalar("world"),
+                BlockEnd,
+                BlockEnd,
+                StreamEnd);
+        }
+
         private void AssertPartialSequenceOfTokensFrom(Scanner scanner, params Token[] tokens)
         {
             var tokenNumber = 1;

YamlDotNet/Core/Scanner.cs

@@ -479,15 +479,15 @@ private void FetchNextToken()
 
             if (analyzer.Check('\''))
             {
-                FetchFlowScalar(true);
+                FetchQuotedScalar(true);
                 return;
             }
 
             // Is it a double-quoted scalar?
 
             if (analyzer.Check('"'))
             {
-                FetchFlowScalar(false);
+                FetchQuotedScalar(false);
                 return;
             }
 
@@ -1770,7 +1770,7 @@ private int ScanBlockScalarBreaks(int currentIndent, StringBuilder breaks, bool
         /// Produce the SCALAR(...,single-quoted) or SCALAR(...,double-quoted) tokens.
         /// </summary>
 
-        private void FetchFlowScalar(bool isSingleQuoted)
+        private void FetchQuotedScalar(bool isSingleQuoted)
         {
             // A plain scalar could be a simple key.
 
@@ -1782,7 +1782,7 @@ private void FetchFlowScalar(bool isSingleQuoted)
 
             // Indicates the adjacent flow scalar that a prior flow scalar has been fetched.
 
-            flowScalarFetched = true;
+            flowScalarFetched = flowLevel > 0;
 
             // Create the SCALAR token and append it to the queue.