Skip to content

Commit 38b79a5

Browse files
committed
Fix tests after introducing exlcusions to default imports of kotlin.js package.
1 parent 33f3106 commit 38b79a5

File tree

11 files changed

+24
-10
lines changed

11 files changed

+24
-10
lines changed

compiler/testData/codegen/box/classes/kt903.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// TARGET_BACKEND: JVM
2+
13
operator fun Int.plus(a: Int?) = this + a!!
24

35
public open class PerfectNumberFinder() {

idea/idea-completion/testData/basic/common/InExpressionNoPrefix.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ class Test {
44
}
55
}
66

7-
// EXIST: Any, Nothing, Unit, Int, Number, Array, Math
7+
// EXIST: Any, Nothing, Unit, Int, Number, Array
88
// EXIST_JAVA_ONLY: Thread

idea/idea-completion/testData/basic/common/InExtendTypeAnnotation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ class Test : <caret> {
33
}
44
}
55

6-
// EXIST: Any, Nothing, Unit, Int, Number, Array, Math
6+
// EXIST: Any, Nothing, Unit, Int, Number, Array
77
// EXIST_JAVA_ONLY: Thread

idea/testData/editor/optimizeImports/js/DefaultJsImports.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
import kotlin.js.json
12
import kotlin.js.Json
3+
import kotlin.js.JSON
4+
import kotlin.js.undefined
25

36
fun main(args: Array<String>) {
4-
val a: Json? = null
7+
val a: dynamic = undefined
8+
val b = JSON.stringify(a)
9+
val j: Json = json("a" to 1)
510
}
611

712
// For KT-3620 Don't auto-import kotlin.js.* and remove in `optimize imports`

idea/testData/editor/optimizeImports/js/DefaultJsImports.kt.after

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
import kotlin.js.Json
2+
import kotlin.js.json
3+
14
fun main(args: Array<String>) {
2-
val a: Json? = null
5+
val a: dynamic = undefined
6+
val b = JSON.stringify(a)
7+
val j: Json = json("a" to 1)
38
}
49

510
// For KT-3620 Don't auto-import kotlin.js.* and remove in `optimize imports`
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Additional checking of reference Getter: JSON
2+
Additional checking of reference KtSimpleNameReference: JSON
3+
Additional checking of reference Getter: undefined
4+
Additional checking of reference KtSimpleNameReference: undefined

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3882,12 +3882,6 @@ public void testKt8011a() throws Exception {
38823882
doTest(fileName);
38833883
}
38843884

3885-
@TestMetadata("kt903.kt")
3886-
public void testKt903() throws Exception {
3887-
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt903.kt");
3888-
doTest(fileName);
3889-
}
3890-
38913885
@TestMetadata("kt940.kt")
38923886
public void testKt940() throws Exception {
38933887
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt940.kt");

js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package creatures
66

77
import jquery.*
8+
import kotlin.js.*
89
import kotlin.browser.window
910
import org.w3c.dom.*
1011

js/js.translator/testData/webDemoCanvasExamples/cases/Fancy lines.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Note that only a subset of the api is supported for now.
66

77
package fancylines
88

9+
import kotlin.js.*
910
import kotlin.browser.window
1011
import org.w3c.dom.*
1112
import jquery.*

js/js.translator/testData/webDemoCanvasExamples/cases/Hello, Kotlin.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package hello
55

6+
import kotlin.js.*
67
import kotlin.browser.window
78
import org.w3c.dom.*
89
import jquery.*

js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package traffic
22

3+
import kotlin.js.*
34
import kotlin.browser.window
45
import org.w3c.dom.*
56
import jquery.*

0 commit comments

Comments
 (0)