Merge pull request #759 from EdwardCooke/ec-fix-757

Allow braces in non-flows
aaubry · Dec 15, 2022 · 40e05a2 · 40e05a2
2 parents 6bf5b44 + cca792b
commit 40e05a2
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 6 deletions.
diff --git a/YamlDotNet.Test/Core/ScannerTests.cs b/YamlDotNet.Test/Core/ScannerTests.cs
@@ -414,6 +414,35 @@ public void Issue_553_562()
             }
         }
 
+        [Fact]
+        public void Plain_Scalar_outside_of_flow_allows_braces()
+        {
+            AssertSequenceOfTokensFrom(Yaml.ScannerForText(@"value: -[123]"),
+                StreamStart,
+                BlockMappingStart,
+                Key,
+                PlainScalar("value"),
+                Value,
+                PlainScalar("-[123]"),
+                BlockEnd,
+                StreamEnd);
+        }
+
+        [Fact]
+        public void Plain_Scalar_inside_flow_does_not_allow_braces()
+        {
+            AssertPartialSequenceOfTokensFrom(Yaml.ScannerForText(@"
+[
+  value: -[123]
+]"),
+                StreamStart,
+                FlowSequenceStart,
+                Key,
+                PlainScalar("value"),
+                Value,
+                Error("Invalid key indicator format."));
+        }
+
         private void AssertPartialSequenceOfTokensFrom(Scanner scanner, params Token[] tokens)
         {
             var tokenNumber = 1;

diff --git a/YamlDotNet.Test/Core/TokenHelper.cs b/YamlDotNet.Test/Core/TokenHelper.cs
@@ -151,6 +151,11 @@ protected static AnchorAlias AnchorAlias(string alias)
             return new AnchorAlias(new AnchorName(alias));
         }
 
+        protected static Error Error(string value)
+        {
+            return new Error(value, new Mark(), new Mark());
+        }
+
         protected static Comment StandaloneComment(string text)
         {
             return new Comment(text, false);

diff --git a/YamlDotNet/Core/Scanner.cs b/YamlDotNet/Core/Scanner.cs
@@ -398,7 +398,7 @@ private void FetchNextToken()
                     FetchBlockEntry();
                     return;
                 }
-                else if (analyzer.Check(",[]{}", 1))
+                else if (flowLevel > 0 && analyzer.Check(",[]{}", 1))
                 {
                     tokens.Enqueue(new Error("Invalid key indicator format.", cursor.Mark(), cursor.Mark()));
                 }

diff --git a/YamlDotNet/Core/Tokens/Error.cs b/YamlDotNet/Core/Tokens/Error.cs
@@ -22,16 +22,16 @@
 namespace YamlDotNet.Core.Tokens
 {
     /// <summary>
-    /// Base class for YAML tokens.
+    /// Error tokens.
     /// </summary>
-    internal class Error : Token
+    public class Error : Token
     {
         /// <summary>
-        /// Gets the value of the comment
+        /// Gets the value of the error
         /// </summary>
-        internal string Value { get; }
+        public string Value { get; }
 
-        internal Error(string value, Mark start, Mark end)
+        public Error(string value, Mark start, Mark end)
             : base(start, end)
         {
             Value = value;