KT-50173 Fix Regex.escapeReplacement function in JS

(cherry picked from commit a829a67)
JetBrains · Dec 12, 2021 · 72551e4 · 72551e4
1 parent c71e090
commit 72551e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/libraries/stdlib/js/src/kotlin/text/regex.kt b/libraries/stdlib/js/src/kotlin/text/regex.kt
@@ -318,7 +318,7 @@ public actual class Regex actual constructor(pattern: String, options: Set<Regex
         public actual fun escapeReplacement(literal: String): String = literal.nativeReplace(replacementEscape, "\\$&")
 
         private val patternEscape = RegExp("""[\\^$*+?.()|[\]{}]""", "g")
-        private val replacementEscape = RegExp("""[\$]""", "g")
+        private val replacementEscape = RegExp("""[\\$]""", "g")
 
         internal fun nativeEscapeReplacement(literal: String): String = literal.nativeReplace(nativeReplacementEscape, "$$$$")
         private val nativeReplacementEscape = RegExp("""\$""", "g")

diff --git a/libraries/stdlib/test/text/RegexTest.kt b/libraries/stdlib/test/text/RegexTest.kt
@@ -262,7 +262,10 @@ class RegexTest {
         // inserts the first captured group
         assertEquals("(123)-(456)", pattern.replace(input, "($1)"))
 
-        assertEquals("$&-$&", pattern.replace(input, Regex.escapeReplacement("$&")))
+        for (r in listOf("$&", "\\$", "\\ $", "$\\")) {
+            assertEquals("$r-$r", pattern.replace(input, Regex.escapeReplacement(r)))
+        }
+
         assertEquals("X-456", pattern.replaceFirst(input, "X"))
 
         val longInput = "0123456789ABC"