From 66abea1f197796ca6dd9b1bea78251825deee13e Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 27 Jan 2017 23:41:32 +0300
Subject: [PATCH] Add explicit imports of kotlin.js.* to stdlib where required.

---
 js/js.libraries/src/core/regex.kt           | 2 +-
 js/js.libraries/src/core/regexp.kt          | 2 +-
 js/js.libraries/src/core/string.kt          | 2 +-
 js/js.libraries/src/core/stringsCode.kt     | 2 +-
 js/js.libraries/src/deprecated/jquery/ui.kt | 1 +
 js/js.libraries/test/core/JsonTest.kt       | 1 +
 js/js.libraries/test/core/RegExpTest.kt     | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/js/js.libraries/src/core/regex.kt b/js/js.libraries/src/core/regex.kt
index 0ad7f68f2bd..5ceab50d5a8 100644
--- a/js/js.libraries/src/core/regex.kt
+++ b/js/js.libraries/src/core/regex.kt
@@ -16,7 +16,7 @@
 
 package kotlin.text
 
-import kotlin.text.js.*
+import kotlin.js.RegExp
 
 /**
  * Provides enumeration values to use to set regular expression options.
diff --git a/js/js.libraries/src/core/regexp.kt b/js/js.libraries/src/core/regexp.kt
index dce3291f7f4..d64ffd69967 100644
--- a/js/js.libraries/src/core/regexp.kt
+++ b/js/js.libraries/src/core/regexp.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlin.text.js
+package kotlin.js
 
 
 public external class RegExp(pattern: String, flags: String? = definedExternally) {
diff --git a/js/js.libraries/src/core/string.kt b/js/js.libraries/src/core/string.kt
index d9519e071c0..e1339527a06 100644
--- a/js/js.libraries/src/core/string.kt
+++ b/js/js.libraries/src/core/string.kt
@@ -1,6 +1,6 @@
 package kotlin.text
 
-import kotlin.text.js.RegExp
+import kotlin.js.RegExp
 
 @kotlin.internal.InlineOnly
 public inline fun String.toUpperCase(): String = asDynamic().toUpperCase()
diff --git a/js/js.libraries/src/core/stringsCode.kt b/js/js.libraries/src/core/stringsCode.kt
index dd5c0e87112..71a5972ad5a 100644
--- a/js/js.libraries/src/core/stringsCode.kt
+++ b/js/js.libraries/src/core/stringsCode.kt
@@ -1,6 +1,6 @@
 package kotlin.text
 
-import kotlin.text.js.RegExp
+import kotlin.js.RegExp
 
 internal inline fun String.nativeIndexOf(ch: Char, fromIndex: Int): Int = nativeIndexOf(ch.toString(), fromIndex)
 internal inline fun String.nativeLastIndexOf(ch: Char, fromIndex: Int): Int = nativeLastIndexOf(ch.toString(), fromIndex)
diff --git a/js/js.libraries/src/deprecated/jquery/ui.kt b/js/js.libraries/src/deprecated/jquery/ui.kt
index 12caa73d1b4..d68db4380ab 100644
--- a/js/js.libraries/src/deprecated/jquery/ui.kt
+++ b/js/js.libraries/src/deprecated/jquery/ui.kt
@@ -3,6 +3,7 @@ package jquery.ui
 
 //jquery UI
 import jquery.JQuery
+import kotlin.js.Json
 
 @Deprecated("JQuery is going to be removed from the standard library")
 public inline fun JQuery.buttonset(): JQuery = asDynamic().buttonset()
diff --git a/js/js.libraries/test/core/JsonTest.kt b/js/js.libraries/test/core/JsonTest.kt
index f15c66508b2..57687d83dc1 100644
--- a/js/js.libraries/test/core/JsonTest.kt
+++ b/js/js.libraries/test/core/JsonTest.kt
@@ -1,5 +1,6 @@
 package test.js
 
+import kotlin.js.*
 import kotlin.test.*
 import org.junit.Test as test
 
diff --git a/js/js.libraries/test/core/RegExpTest.kt b/js/js.libraries/test/core/RegExpTest.kt
index 23cc6c69ae6..bdfa8d51fde 100644
--- a/js/js.libraries/test/core/RegExpTest.kt
+++ b/js/js.libraries/test/core/RegExpTest.kt
@@ -16,7 +16,7 @@
 
 package test.js
 
-import kotlin.text.js.*
+import kotlin.js.*
 
 import kotlin.test.*
 import org.junit.Test as test