Fixes empty lines in yaml maps (#1570)

Fix from @jobe-m backported from korlibs/kproject#12
korlibs · May 4, 2023 · e479b66 · e479b66
1 parent 5b97cea
commit e479b66
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 32 deletions.
diff --git a/korio/src/commonMain/kotlin/korlibs/io/serialization/yaml/Yaml.kt b/korio/src/commonMain/kotlin/korlibs/io/serialization/yaml/Yaml.kt
@@ -169,6 +169,7 @@ object Yaml {
             // Line start
             flush()
             val indentStr = readWhile(Char::isWhitespace).replace("\t", "     ")
+            if (indentStr.contains('\n')) continue@linestart  // ignore empty lines with possible additional indent
             val indent = indentStr.length
             if (indents.isEmpty() || indent > indents.last()) {
                 indents += indent

diff --git a/korio/src/commonTest/kotlin/korlibs/io/serialization/yaml/YamlTest.kt b/korio/src/commonTest/kotlin/korlibs/io/serialization/yaml/YamlTest.kt
@@ -236,27 +236,38 @@ class YamlTest {
 	//	)
 	//}
 
-	@Test
-	fun testMapListIssue() {
-		assertEquals(
-			mapOf(
-				"hello" to listOf("a", "b"),
-				"world" to listOf("c", "d"),
-				"test" to listOf("e", "f")
-			),
-			Yaml.decode("""
-			hello:
-			- a
-			- b
-			world:
-			- c
-			- d
-			test:
-			- e
-			- f
-		""".trimIndent())
-		)
-	}
+    @Test
+    fun testMapListIssue() {
+        val testYmlString = """
+            hello:
+            - a
+            
+            - b
+              
+            lineWithSpaces:
+              
+              
+            - aa
+            - bb
+              
+            world:
+            - c
+            - d
+            test:
+              - e
+              - f
+        """.trimIndent()
+        //println("\n\n[[[$testYmlString]]]\n\n")
+        assertEquals(
+            mapOf(
+                "hello" to listOf("a", "b"),
+                "lineWithSpaces" to listOf("aa", "bb"),
+                "world" to listOf("c", "d"),
+                "test" to listOf("e", "f")
+            ),
+            Yaml.decode(testYmlString)
+        )
+    }
 
     @Test
     fun testWindowsLineEndings() {

diff --git a/korte/src/commonMain/kotlin/korlibs/template/internal/Yaml.kt b/korte/src/commonMain/kotlin/korlibs/template/internal/Yaml.kt
@@ -165,6 +165,7 @@ internal object Yaml {
             // Line start
             flush()
             val indentStr = readWhile(Char::isWhitespace).replace("\t", "     ")
+            if (indentStr.contains('\n')) continue@linestart  // ignore empty lines with possible additional indent
             val indent = indentStr.length
             if (indents.isEmpty() || indent > indents.last()) {
                 indents += indent

diff --git a/korte/src/commonTest/kotlin/korlibs/template/YamlTest.kt b/korte/src/commonTest/kotlin/korlibs/template/YamlTest.kt
@@ -240,23 +240,34 @@ class YamlTest {
 
     @Test
     fun testMapListIssue() {
+        val testYmlString = """
+            hello:
+            - a
+            
+            - b
+              
+            lineWithSpaces:
+              
+              
+            - aa
+            - bb
+              
+            world:
+            - c
+            - d
+            test:
+              - e
+              - f
+        """.trimIndent()
+        //println("\n\n[[[$testYmlString]]]\n\n")
         assertEquals(
             mapOf(
                 "hello" to listOf("a", "b"),
+                "lineWithSpaces" to listOf("aa", "bb"),
                 "world" to listOf("c", "d"),
                 "test" to listOf("e", "f")
             ),
-            Yaml.decode("""
-			hello:
-			- a
-			- b
-			world:
-			- c
-			- d
-			test:
-			- e
-			- f
-		""".trimIndent())
+            Yaml.decode(testYmlString)
         )
     }