JS: when translating content of js() function, rename all free references if they point to Kotlin local variable with the same name. See KT-15212

js/js.translator/testData/box/inline/jsCode.kt

@@ -0,0 +1,14 @@
+package foo
+
+// CHECK_CONTAINS_NO_CALLS: test
+
+internal inline fun sum(x: Int, y: Int): Int = js("x + y")
+
+internal fun test(x: Int, y: Int): Int = sum(sum(x, x), sum(y, y))
+
+fun box(): String {
+    assertEquals(4, test(1, 1))
+    assertEquals(8, test(1, 3))
+
+    return "OK"
+}

js/js.translator/testData/box/inline/jsCodeVarDeclared.kt

@@ -0,0 +1,20 @@
+package foo
+
+// CHECK_CONTAINS_NO_CALLS: test
+
+internal inline fun sum(x: Int, y: Int): Int = js("var a = x; a + y")
+
+internal fun test(x: Int, y: Int): Int {
+    val xx = sum(x, x)
+    js("var a = 0;")
+    val yy = sum(y, y)
+
+    return sum(xx, yy)
+}
+
+fun box(): String {
+    assertEquals(4, test(1, 1))
+    assertEquals(8, test(1, 3))
+
+    return "OK"
+}

js/js.translator/testData/box/jsCode/referenceToKotlin.js

@@ -0,0 +1,5 @@
+function p(x) {
+    return x + ";";
+}
+
+var _ = "";

js/js.translator/testData/box/jsCode/referenceToKotlin.kt

@@ -0,0 +1,120 @@
+external fun p(m: String): String
+
+var log = ""
+
+fun test1(p: String): String {
+    log += p("start1")
+    return js("return p;")
+}
+
+fun test2(): String {
+    val p = "test2"
+    log += p("start2")
+    return js("p")
+}
+
+fun test3(): String {
+    val p = "wrong3"
+    return js("var p = 'test3'; p")
+}
+
+fun test4(): String {
+    return js("p('test4')")
+}
+
+fun test5(): String {
+    val p = "wrong5"
+    fun f() = js("p('test5')")
+    return f()
+}
+
+fun test6(): String {
+    log += p("start6")
+    val p = "test6"
+    return js("""
+        var x = p;
+        var g = function(p) {
+            return x + p;
+        };
+        g("-ok");
+    """)
+}
+
+fun test7(): String {
+    log += p("start7")
+    val p = "test7"
+    return js("""
+        var g = function() {
+            return p;
+        };
+        g();
+    """)
+}
+
+fun test8(): String {
+    val p = "wrong8"
+    val list = listOf("t", "e", "s", "t", "8")
+    var result = ""
+    for (p in list) {
+        result += js("p")
+    }
+    return result
+}
+
+fun test9(): String {
+    val p = "wrong9"
+    val list = listOf("t" to "e", "s" to "t", "9" to "!")
+    var result = ""
+    for ((p, q) in list) {
+        result += js("p")
+        result += js("q")
+    }
+    return result
+}
+
+fun test10(): String {
+    val list = listOf("O" to "K")
+    var result = ""
+    for ((p, _) in list) {
+        result += js("typeof p")
+        result += ";"
+        result += js("typeof _")
+    }
+    return result
+}
+
+fun box(): String {
+    var result = test1("test1")
+    if (result != "test1") return "fail1: $result"
+
+    result = test2()
+    if (result != "test2") return "fail2: $result"
+
+    result = test3()
+    if (result != "test3") return "fail3: $result"
+
+    result = test4()
+    if (result != "test4;") return "fail4: $result"
+
+    result = test5()
+    if (result != "test5;") return "fail5: $result"
+
+    result = test6()
+    if (result != "test6-ok") return "fail6: $result"
+
+    result = test7()
+    if (result != "test7") return "fail7: $result"
+
+    result = test8()
+    if (result != "test8") return "fail8: $result"
+
+    result = test9()
+    if (result != "test9!") return "fail9: $result"
+
+    result = test10()
+    if (result != "string;object") return "fail10: $result"
+
+    if (log != "start1;start2;start6;start7;") return "fail log: $log"
+
+    return "OK"
+}

js/js.translator/testData/box/native/jsTypeOf.kt

@@ -1,18 +0,0 @@
-fun box(): String {
-    var result = jsTypeOf(23)
-    if (result != "number") return "fail1: $result"
-
-    result = jsTypeOf("23")
-    if (result != "string") return "fail2: $result"
-
-    result = jsTypeOf({ x: Int -> x })
-    if (result != "function") return "fail3: $result"
-
-    result = jsTypeOf(object {})
-    if (result != "object") return "fail4: $result"
-
-    result = jsTypeOf(true)
-    if (result != "boolean") return "fail5: $result"
-
-    return "OK"
-}

js/js.translator/testData/kotlin_lib_ecma5.js

@@ -270,8 +270,6 @@
         return cache.value;
     }
 
-    Kotlin.jsTypeOf = function(a) { return typeof a; };
-
 ////////////////////////////////// packages & modules //////////////////////////////
 
     Kotlin.modules = {};