Fix string quotation for StringSerialization.NONE, fix #17

Him188 · Dec 12, 2020 · d0752bd · d0752bd
1 parent ea99fdf
commit d0752bd
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 3 deletions.
diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Escape.kt b/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Escape.kt
@@ -394,7 +394,7 @@ internal fun String.getQuotationAvailability(): Int {
     var canBeUnquoted = true
     var doubleWithoutEscape = true
 
-    if (this.startsWith(' ') || this.endsWith(' ')) {
+    if (this.first().isWhitespace() || this.last().isWhitespace()) {
         canBeUnquoted = false
     }
 
@@ -411,11 +411,23 @@ internal fun String.getQuotationAvailability(): Int {
             doubleWithoutEscape && REPLACEMENT_CHARS.getOrNull(c.toInt()) != null -> {
                 doubleWithoutEscape = false
             }
-            c == '\'' -> canBeSingleQuoted = false
-            c == '\"' -> doubleWithoutEscape = false
+            c == '\'' -> {
+                canBeSingleQuoted = false
+                canBeUnquoted = false
+            }
+            c == '\"' -> {
+                doubleWithoutEscape = false
+                canBeUnquoted = false
+            }
+
             c == '#' -> canBeUnquoted = false
             c == ':' -> lastIsColon = true
             c == ' ' && lastIsColon -> canBeUnquoted = false
+            c in """
+                []{}"'$^*|>-?/~
+                """.trimIndent() -> { // less mistakes
+                canBeUnquoted = false
+            }
         }
     }
     if (lastIsColon) canBeUnquoted = false

diff --git a/yamlkt/src/jvmTest/kotlin/net/mamoe/yamlkt/testsFromIssues/17.kt b/yamlkt/src/jvmTest/kotlin/net/mamoe/yamlkt/testsFromIssues/17.kt
@@ -0,0 +1,36 @@
+package net.mamoe.yamlkt.testsFromIssues
+
+import kotlinx.serialization.Serializable
+import net.mamoe.yamlkt.Yaml
+import org.junit.Test
+import kotlin.test.assertEquals
+
+internal class Issue17 {
+    private val yaml = Yaml {
+        // Error without DOUBLE_QUOTATION
+        //stringSerialization = DOUBLE_QUOTATION
+    }
+
+    @Serializable
+    data class TestData(
+        val test: String,
+        val test2: String,
+        val test3: String,
+    )
+
+    @Test
+    fun testYaml() {
+        val data = TestData(
+            test = "testString",
+            test2 = "--some \"text {{.val}}\\t{{.another}}\"",
+            test3 = "\${testString}",
+        )
+
+        val encodedString = yaml.encodeToString(TestData.serializer(), data)
+        println(encodedString)
+        val decodedData = yaml.decodeFromString(TestData.serializer(), encodedString)
+        println(decodedData)
+
+        assertEquals(data, decodedData)
+    }
+}