Fix parsing colon followed by comma

VirtusLab · Nov 13, 2021 · 2393d74 · 2393d74
1 parent e82ad39
commit 2393d74
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/yaml/shared/src/main/scala/org/virtuslab/yaml/internal/load/reader/Tokenizer.scala b/yaml/shared/src/main/scala/org/virtuslab/yaml/internal/load/reader/Tokenizer.scala
@@ -477,7 +477,7 @@ private[yaml] class Scanner(str: String) extends Tokenizer {
       val peeked = in.peek()
       peeked match
         case Some(':') if in.isNextWhitespace                   => sb.result()
-        case Some(':') if in.peekNext().exists(_ == ',')        => sb.result()
+        case Some(':') if in.peekNext().exists(_ == ',') && ctx.isInFlowCollection       => sb.result()
         case Some(char) if !ctx.isAllowedSpecialCharacter(char) => sb.result()
         case _ if isDocumentEnd || isDocumentStart              => sb.result()
         case Some(' ') if in.peekNext() == Some('#')            => sb.result()

diff --git a/yaml/shared/src/test/scala/org/virtuslab/yaml/parser/SequenceSuite.scala b/yaml/shared/src/test/scala/org/virtuslab/yaml/parser/SequenceSuite.scala
@@ -313,3 +313,19 @@ class SequenceSuite extends BaseYamlSuite:
     )
     assertEquals(yaml.events, Right(expectedEvents))
   }
+
+  test("colon followed by comma".only) {
+    val yaml =
+      """- :,"""
+
+    val expectedEvents = List(
+      StreamStart,
+      DocumentStart(),
+      SequenceStart(),
+      Scalar(":,"),
+      SequenceEnd,
+      DocumentEnd(),
+      StreamEnd
+    )
+    assertEquals(yaml.events, Right(expectedEvents))
+  }