From 0579f6c8bf9fef26dbbd3907da23345d4a7a26df Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 7 Nov 2015 15:30:44 +0300
Subject: [PATCH] Replace Regex.match and matchAll usages

---
 .../org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt | 2 +-
 .../org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt  | 4 ++--
 compiler/tests/org/jetbrains/kotlin/daemon/LogCheckUtil.kt    | 2 +-
 js/js.libraries/src/core/regex.kt                             | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt
index eaa49e1d9a7..4f594435d14 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt
@@ -171,7 +171,7 @@ public object TypeIntrinsics {
      */
     private fun getFunctionTypeArity(jetType: KotlinType): Int {
         val classFqName = getClassFqName(jetType) ?: return -1
-        val match = KOTLIN_FUNCTION_INTERFACE_REGEX.match(classFqName) ?: return -1
+        val match = KOTLIN_FUNCTION_INTERFACE_REGEX.find(classFqName) ?: return -1
         return Integer.valueOf(match.groups[1]!!.value)
     }
 
diff --git a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt
index d48cfb5d6f4..977d79608de 100644
--- a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt
+++ b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt
@@ -254,8 +254,8 @@ public object KotlinCompilerClient {
 
 
     private fun String.extractPortFromRunFilename(digest: String): Int =
-        makeRunFilenameString(timestamp = "[0-9TZ:\\.\\+-]+", digest = digest, port = "(\\d+)", escapeSequence = "\\").toRegex()
-            .match(this)
+            makeRunFilenameString(timestamp = "[0-9TZ:\\.\\+-]+", digest = digest, port = "(\\d+)", escapeSequence = "\\").toRegex()
+                    .find(this)
             ?.groups?.get(1)
             ?.value?.toInt()
             ?: 0
diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/LogCheckUtil.kt b/compiler/tests/org/jetbrains/kotlin/daemon/LogCheckUtil.kt
index 6b04f1f4c40..7a77a318102 100644
--- a/compiler/tests/org/jetbrains/kotlin/daemon/LogCheckUtil.kt
+++ b/compiler/tests/org/jetbrains/kotlin/daemon/LogCheckUtil.kt
@@ -42,7 +42,7 @@ internal fun Sequence<String>.ifNotContainsSequence(patternsIter: Iterator<LineP
                    { acc, line ->
                        when {
                            !acc.iter.isValid() -> return@fold acc
-                           acc.iter.value.regex.match(line)?.let { acc.iter.value.matchCheck(it) } ?: false -> acc.nextLineAndPattern()
+                           acc.iter.value.regex.find(line)?.let { acc.iter.value.matchCheck(it) } ?: false -> acc.nextLineAndPattern()
                            else -> acc.nextLine()
                        }
                    }
diff --git a/js/js.libraries/src/core/regex.kt b/js/js.libraries/src/core/regex.kt
index 6ffbf00d655..eb7481a4f9d 100644
--- a/js/js.libraries/src/core/regex.kt
+++ b/js/js.libraries/src/core/regex.kt
@@ -110,7 +110,7 @@ public class Regex(pattern: String, options: Set<RegexOption>) {
      * replacement for that match.
      */
     public inline fun replace(input: CharSequence, transform: (MatchResult) -> CharSequence): String {
-        var match = match(input)
+        var match = find(input)
         if (match == null) return input.toString()
 
         var lastStart = 0
@@ -148,7 +148,7 @@ public class Regex(pattern: String, options: Set<RegexOption>) {
      */
     public fun split(input: CharSequence, limit: Int = 0): List<String> {
         require(limit >= 0, { "Limit must be non-negative, but was $limit" } )
-        val matches = matchAll(input).let { if (limit == 0) it else it.take(limit - 1) }
+        val matches = findAll(input).let { if (limit == 0) it else it.take(limit - 1) }
         val result = ArrayList<String>()
         var lastStart = 0