From a829a6743d03509659a88bc49b25ae0abe230343 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 11 Dec 2021 11:11:34 +0300
Subject: [PATCH] KT-50173 Fix Regex.escapeReplacement function in JS

---
 libraries/stdlib/js/src/kotlin/text/regex.kt | 2 +-
 libraries/stdlib/test/text/RegexTest.kt      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/stdlib/js/src/kotlin/text/regex.kt b/libraries/stdlib/js/src/kotlin/text/regex.kt
index 2eedcaa46df..c9f282f0f8c 100644
--- 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
index 80f0e29801e..fea30a9402f 100644
--- a/libraries/stdlib/test/text/RegexTest.kt
+++ b/libraries/stdlib/test/text/RegexTest.kt
@@ -263,7 +263,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"