Fix escape with unicode letters, close #11

Him188 · Sep 10, 2020 · 354c8f1 · 354c8f1
1 parent acb6ba0
commit 354c8f1
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Escape.kt b/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Escape.kt
@@ -407,7 +407,7 @@ internal fun String.getQuotationAvailability(): Int {
                 doubleWithoutEscape = false
                 canBeUnquoted = false
             }
-            doubleWithoutEscape && REPLACEMENT_CHARS[c.toInt()] != null -> {
+            doubleWithoutEscape && REPLACEMENT_CHARS.getOrNull(c.toInt()) != null -> {
                 doubleWithoutEscape = false
             }
             c == '\'' -> canBeSingleQuoted = false

diff --git a/yamlkt/src/jvmTest/kotlin/net/mamoe/yamlkt/decoder/DecoderEscapeTest.kt b/yamlkt/src/jvmTest/kotlin/net/mamoe/yamlkt/decoder/DecoderEscapeTest.kt
@@ -9,6 +9,16 @@ import kotlin.test.assertFailsWith
 
 internal class DecoderEscapeTest {
 
+    @Test
+    fun escapeColon() {
+        assertEquals(
+            ":",
+            default.decodeAnyFromString(
+                """":""""
+            )
+        )
+    }
+
     @Test
     fun escapeMapping() {
         val mappings: Map<String, String> = mapOf(

diff --git a/yamlkt/src/jvmTest/kotlin/net/mamoe/yamlkt/encoder/TestEncoderEscape.kt b/yamlkt/src/jvmTest/kotlin/net/mamoe/yamlkt/encoder/TestEncoderEscape.kt
@@ -37,6 +37,30 @@ internal class TestEncoderEscape {
         assertEquals("\'\n\'", best.encodeToString<String>("\n")) // will adjust to single
     }
 
+    @Test
+    fun colonEscape() {
+        assertEquals("\":\"", double.encodeToString<String>(":"))
+        assertEquals("\':\'", single.encodeToString<String>(":"))
+        assertEquals("\':\'", none.encodeToString<String>(":"))
+        assertEquals("\':\'", best.encodeToString<String>(":"))
+    }
+
+    @Test
+    fun colonEscapeWithChinese() {
+        assertEquals("\":好\"", double.encodeToString<String>(":好"))
+        assertEquals("\':好\'", single.encodeToString<String>(":好"))
+        assertEquals("\':好\'", none.encodeToString<String>(":好"))
+        assertEquals("\':好\'", best.encodeToString<String>(":好"))
+    }
+
+    @Test
+    fun spaceEscape() {
+        assertEquals("\" \"", double.encodeToString<String>(" "))
+        assertEquals("\' \'", single.encodeToString<String>(" "))
+        assertEquals("\' \'", none.encodeToString<String>(" "))
+        assertEquals("\' \'", best.encodeToString<String>(" "))
+    }
+
     @Test
     fun testUnicodeEscape() {
         assertEquals(