Limit escaping to & char

Kotlin · Oct 5, 2023 · e0e613c · e0e613c
1 parent de82c41
commit e0e613c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/commonMain/kotlin/stream.kt b/src/commonMain/kotlin/stream.kt
@@ -191,7 +191,7 @@ internal fun Appendable.escapeAppend(value: CharSequence) {
     while (currentIndex < value.length) {
         val code = value[currentIndex].code
 
-        if (code == '\\'.code) {
+        if (code == '\\'.code && currentIndex + 1 < value.length && value[currentIndex + 1] == '&') {
             append(value.substring(lastIndex, currentIndex))
             check(currentIndex + 1 < value.length) { "String must not end with '\\'." }
             append(value[currentIndex + 1])

diff --git a/src/commonTest/kotlin/EscapeAppendTest.kt b/src/commonTest/kotlin/EscapeAppendTest.kt
@@ -7,7 +7,7 @@ class EscapeAppendTest {
     @Test
     fun testAppendEscaped() {
         assertEquals("&", escape("\\&"))
-        assertEquals("a", escape("\\a"))
+        assertEquals("\\a", escape("\\a"))
     }
 
     @Test
@@ -25,6 +25,16 @@ class EscapeAppendTest {
         assertEquals("&&amp;", escape("\\&&"))
         assertEquals("&amp;", escape("\\&amp;"))
     }
+
+    @Test
+    fun testEscapeSlash() {
+        assertEquals("\\", escape("\\"))
+    }
+
+    @Test
+    fun testEscapeUnicode() {
+        assertEquals("\\u003d", escape("\\u003d"))
+    }
 }
 
 private fun escape(string: String): String = buildString {