From 33f515817079d1793b04de7324b7d67aaa562cdf Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 13 May 2015 23:45:37 +0300
Subject: [PATCH] Fix deprecated replaceAll and replaceFirst usages in stdlib
 tests and tools.

---
 libraries/stdlib/test/text/StringJVMTest.kt        | 14 +++++++-------
 .../kotlin/doc/highlighter/SyntaxHighlighter.kt    |  2 +-
 .../org/jetbrains/kotlin/doc/model/KotlinModel.kt  |  2 +-
 .../org/jetbrains/kotlin/gradle/BaseGradleIT.kt    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libraries/stdlib/test/text/StringJVMTest.kt b/libraries/stdlib/test/text/StringJVMTest.kt
index 4617c959576..62c719fb37f 100644
--- a/libraries/stdlib/test/text/StringJVMTest.kt
+++ b/libraries/stdlib/test/text/StringJVMTest.kt
@@ -305,31 +305,31 @@ class StringJVMTest {
 
     test fun testReplaceAllClosure() {
         val s = "test123zzz"
-        val result = s.replaceAll("\\d+") { mr ->
-            "[" + mr.group() + "]"
+        val result = s.replace("\\d+".toRegex()) { mr ->
+            "[" + mr.value + "]"
         }
         assertEquals("test[123]zzz", result)
     }
 
     test fun testReplaceAllClosureAtStart() {
         val s = "123zzz"
-        val result = s.replaceAll("\\d+") { mr ->
-            "[" + mr.group() + "]"
+        val result = s.replace("\\d+".toRegex()) { mr ->
+            "[" + mr.value + "]"
         }
         assertEquals("[123]zzz", result)
     }
 
     test fun testReplaceAllClosureAtEnd() {
         val s = "test123"
-        val result = s.replaceAll("\\d+") { mr ->
-            "[" + mr.group() + "]"
+        val result = s.replace("\\d+".toRegex()) { mr ->
+            "[" + mr.value + "]"
         }
         assertEquals("test[123]", result)
     }
 
     test fun testReplaceAllClosureEmpty() {
         val s = ""
-        val result = s.replaceAll("\\d+") { mr ->
+        val result = s.replace("\\d+".toRegex()) { mr ->
             "x"
         }
         assertEquals("", result)
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt
index d5b269300ae..583ecc6d45f 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt
@@ -46,7 +46,7 @@ class SyntaxHighlighter() {
                 lexer.advance()
                 val token = lexer.getTokenType()
                 if (token == null) break
-                val tokenText = lexer.getTokenSequence().toString().replaceAll("\n", "\r\n")
+                val tokenText = lexer.getTokenSequence().toString().replace("\n", "\r\n")
                 var style: String? = null
                 if (token is JetKeywordToken) {
                     style = "keyword"
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
index 45830b74b62..b5f0d5bb1ac 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
@@ -204,7 +204,7 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs
 
         sourcesInfo = sources.map { source ->
             val relativePath = relativePath(source)
-            val htmlPath = relativePath.replaceFirst("\\.kt$", "") + ".html"
+            val htmlPath = relativePath.replaceFirst("\\.kt$".toRegex(), "") + ".html"
             SourceInfo(source, relativePath, htmlPath)
         }
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
index 279aa0069f7..62206eedb5b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
@@ -105,7 +105,7 @@ abstract class BaseGradleIT {
             listOf("/bin/bash", "./gradlew") + tailParameters
     }
 
-    private fun String.normalize() = this.replaceAll("\r\n", "\n").replaceAll("\n", SYSTEM_LINE_SEPARATOR)
+    private fun String.normalize() = this.lineSequence().join(SYSTEM_LINE_SEPARATOR)
 
     private fun isWindows(): Boolean {
         return System.getProperty("os.name")!!.contains("Windows")