From a71fbda8a1a522e230b37d36ec55ba7aabb0386f Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Sun, 25 Dec 2016 11:51:54 +0300
Subject: [PATCH] KJS: remove deprecated splitWithRegex and it's implementation
 in kotlin_lib.js

---
 js/js.libraries/src/core/string.kt            |  8 -----
 js/js.libraries/src/js/kotlin_lib.js          |  4 ---
 .../js/test/semantics/BoxJsTestGenerated.java |  6 ----
 .../box/expression/stringClass/stringSplit.kt | 30 -------------------
 4 files changed, 48 deletions(-)
 delete mode 100644 js/js.translator/testData/box/expression/stringClass/stringSplit.kt

diff --git a/js/js.libraries/src/core/string.kt b/js/js.libraries/src/core/string.kt
index 73d11fc6245..f88a9101c52 100644
--- a/js/js.libraries/src/core/string.kt
+++ b/js/js.libraries/src/core/string.kt
@@ -14,14 +14,6 @@ internal inline fun String.nativeStartsWith(s: String, position: Int): Boolean =
 
 internal inline fun String.nativeEndsWith(s: String): Boolean = asDynamic().endsWith(s)
 
-@Deprecated("Use split(Regex) instead.", ReplaceWith("split(regex.toRegex()).toTypedArray()"))
-@library("splitString")
-public fun String.splitWithRegex(regex: String): Array<String> = noImpl
-
-@Deprecated("Use split(Regex) instead.", ReplaceWith("split(regex.toRegex(), limit = limit).toTypedArray()"))
-@library("splitString")
-public fun String.splitWithRegex(regex: String, limit: Int): Array<String> = noImpl
-
 public inline fun String.substring(startIndex: Int): String = asDynamic().substring(startIndex)
 
 public inline fun String.substring(startIndex: Int, endIndex: Int): String = asDynamic().substring(startIndex, endIndex)
diff --git a/js/js.libraries/src/js/kotlin_lib.js b/js/js.libraries/src/js/kotlin_lib.js
index a9e46a828fb..bce6d3927fe 100644
--- a/js/js.libraries/src/js/kotlin_lib.js
+++ b/js/js.libraries/src/js/kotlin_lib.js
@@ -278,10 +278,6 @@ Kotlin.primitiveArraySort = function(array) {
     array.sort(Kotlin.primitiveCompareTo)
 };
 
-Kotlin.splitString = function (str, regex, limit) {
-    return str.split(new RegExp(regex), limit);
-};
-
 Kotlin.nullArray = function (size) {
     var res = [];
     var i = size;
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java
index c43b2603013..89bae4d7a3f 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java
@@ -2941,12 +2941,6 @@ public class BoxJsTestGenerated extends AbstractBoxJsTest {
                 doTest(fileName);
             }
 
-            @TestMetadata("stringSplit.kt")
-            public void testStringSplit() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/box/expression/stringClass/stringSplit.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("subSequence.kt")
             public void testSubSequence() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/box/expression/stringClass/subSequence.kt");
diff --git a/js/js.translator/testData/box/expression/stringClass/stringSplit.kt b/js/js.translator/testData/box/expression/stringClass/stringSplit.kt
deleted file mode 100644
index a53905da782..00000000000
--- a/js/js.translator/testData/box/expression/stringClass/stringSplit.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package foo
-
-fun box(): String {
-    val testInput = "test data\t1foo  2 bar"
-    val tests = arrayOf(
-            " "     to arrayOf("test", "data\t1foo", "", "2", "bar"),
-            "\\s+"  to arrayOf("test", "data", "1foo", "2", "bar"),
-            "[sd]"  to arrayOf("te", "t ", "ata\t1foo  2 bar"),
-            "[\\d]" to arrayOf("test data\t", "foo  ", " bar")
-    )
-
-    for (test in tests) {
-        val regexp = test.first
-        val expected = test.second
-        val result = testInput.splitWithRegex(regexp)
-
-        if (result.asList() != expected.asList()) return "Wrong result for '$regexp' -- Expected: $expected | Actual: $result"
-    }
-
-    for (test in tests) {
-        val regexp = test.first
-        val limit = 2
-        val expected = Array(limit) { test.second[it] }
-        val result = testInput.splitWithRegex(regexp, limit)
-
-        if (result.asList() != expected.asList()) return "Wrong result for '$regexp' -- Expected: $expected | Actual: $result"
-    }
-
-    return "OK"
-}
\ No newline at end of file