From 1ae7c2af212ecb6604eafe6e4de157b33bb2dac6 Mon Sep 17 00:00:00 2001
From: Abduqodiri Qurbonzoda <abduqodiri.qurbonzoda@jetbrains.com>
Date: Thu, 30 Sep 2021 17:46:49 +0300
Subject: [PATCH] Use JS substituteGroupRefs implementation in Native as well

---
 .../src/main/kotlin/kotlin/text/Regex.kt      | 91 ++++++++++++-------
 libraries/stdlib/js/src/kotlin/text/regex.kt  |  1 +
 2 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/text/Regex.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/text/Regex.kt
index 2c1bf8fc554..cb24f6a6225 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/text/Regex.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/text/Regex.kt
@@ -220,38 +220,6 @@ public actual class Regex internal constructor(internal val nativePattern: Patte
         return matchResult
     }
 
-    private fun processReplacement(match: MatchResult, replacement: String): String {
-        val result = StringBuilder(replacement.length)
-        var escaped = false
-        var backReference = false
-        for (ch in replacement) {
-            when {
-                escaped -> {
-                    result.append(ch)
-                    escaped = false
-                }
-                backReference -> {
-                    if (ch !in '0'..'9') {
-                        throw IllegalArgumentException("Incorrect back reference: $ch.")
-                    }
-                    val group = ch - '0'
-                    result.append(match.groupValues[group])
-                    // We don't catch IndexOutOfBoundException here because
-                    // it's a correct exception in case of a wrong group number.
-                    // TODO: But we can rethrow it with more informative message.
-                    backReference = false
-                }
-                ch == '\\' -> escaped = true
-                ch == '$' -> backReference = true
-                else -> result.append(ch)
-            }
-        }
-        if (backReference || escaped) {
-            throw IllegalArgumentException("Unexpected end of replacement.")
-        }
-        return result.toString()
-    }
-
     /**
      * Replaces all occurrences of this regular expression in the specified [input] string with specified [replacement] expression.
      *
@@ -272,7 +240,7 @@ public actual class Regex internal constructor(internal val nativePattern: Patte
      * @throws RuntimeException if [replacement] expression is malformed, or capturing group with specified `name` or `index` does not exist
      */
     actual fun replace(input: CharSequence, replacement: String): String
-            = replace(input) { match -> processReplacement(match, replacement) }
+            = replace(input) { match -> substituteGroupRefs(match, replacement) }
 
     /**
      * Replaces all occurrences of this regular expression in the specified [input] string with the result of
@@ -324,7 +292,7 @@ public actual class Regex internal constructor(internal val nativePattern: Patte
         val length = input.length
         val result = StringBuilder(length)
         result.append(input, 0, match.range.start)
-        result.append(processReplacement(match, replacement))
+        result.append(substituteGroupRefs(match, replacement))
         if (match.range.endInclusive + 1 < length) {
             result.append(input, match.range.endInclusive + 1, length)
         }
@@ -403,3 +371,58 @@ public actual class Regex internal constructor(internal val nativePattern: Patte
      */
     override fun toString(): String = nativePattern.toString()
 }
+
+// The same code from K/JS regex.kt
+private fun substituteGroupRefs(match: MatchResult, replacement: String): String {
+    var index = 0
+    val result = StringBuilder(replacement.length)
+
+    while (index < replacement.length) {
+        val char = replacement[index++]
+        if (char == '\\') {
+            if (index == replacement.length)
+                throw IllegalArgumentException("The Char to be escaped is missing")
+
+            result.append(replacement[index++])
+        } else if (char == '$') {
+            if (index == replacement.length)
+                throw IllegalArgumentException("Capturing group index is missing")
+
+            if (replacement[index] == '{')
+                throw IllegalArgumentException("Named capturing group reference currently is not supported")
+
+            if (replacement[index] !in '0'..'9')
+                throw IllegalArgumentException("Invalid capturing group reference")
+
+            val endIndex = replacement.readGroupIndex(index, match.groupValues.size)
+            val groupIndex = replacement.substring(index, endIndex).toInt()
+
+            if (groupIndex >= match.groupValues.size)
+                throw IndexOutOfBoundsException("Group with index $groupIndex does not exist")
+
+            result.append(match.groupValues[groupIndex])
+            index = endIndex
+        } else {
+            result.append(char)
+        }
+    }
+    return result.toString()
+}
+
+private fun String.readGroupIndex(startIndex: Int, groupCount: Int): Int {
+    // at least one digit after '$' is always captured
+    var index = startIndex + 1
+    var groupIndex = this[startIndex] - '0'
+
+    // capture the largest valid group index
+    while (index < length && this[index] in '0'..'9') {
+        val newGroupIndex = (groupIndex * 10) + (this[index] - '0')
+        if (newGroupIndex in 0 until groupCount) {
+            groupIndex = newGroupIndex
+            index++
+        } else {
+            break
+        }
+    }
+    return index
+}
diff --git a/libraries/stdlib/js/src/kotlin/text/regex.kt b/libraries/stdlib/js/src/kotlin/text/regex.kt
index 9c2cfd43865..5771d67e914 100644
--- a/libraries/stdlib/js/src/kotlin/text/regex.kt
+++ b/libraries/stdlib/js/src/kotlin/text/regex.kt
@@ -359,6 +359,7 @@ private fun RegExp.findNext(input: String, from: Int, nextPattern: RegExp): Matc
     }
 }
 
+// The same code from K/N Regex.kt
 private fun substituteGroupRefs(match: MatchResult, replacement: String): String {
     var index = 0
     val result = StringBuilder(replacement.length)