Add explicit imports of kotlin.js.* to generated files.

ilya-g · ilya-g · commit 25c30645546b · 2017-01-30T19:44:51.000+03:00
diff --git a/js/js.libraries/src/core/generated/_ArraysJs.kt b/js/js.libraries/src/core/generated/_ArraysJs.kt
@@ -8,6 +8,7 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.js.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_CollectionsJs.kt b/js/js.libraries/src/core/generated/_CollectionsJs.kt
@@ -8,6 +8,7 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.js.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_ComparisonsJs.kt b/js/js.libraries/src/core/generated/_ComparisonsJs.kt
@@ -8,6 +8,7 @@ package kotlin.comparisons
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.js.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_MapsJs.kt b/js/js.libraries/src/core/generated/_MapsJs.kt
@@ -8,6 +8,7 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.js.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_RangesJs.kt b/js/js.libraries/src/core/generated/_RangesJs.kt
@@ -8,6 +8,7 @@ package kotlin.ranges
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.js.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_SequencesJs.kt b/js/js.libraries/src/core/generated/_SequencesJs.kt
@@ -8,6 +8,7 @@ package kotlin.sequences
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.js.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_SetsJs.kt b/js/js.libraries/src/core/generated/_SetsJs.kt
@@ -8,6 +8,7 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.js.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/core/generated/_StringsJs.kt b/js/js.libraries/src/core/generated/_StringsJs.kt
@@ -8,6 +8,7 @@ package kotlin.text
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.js.*
 import kotlin.comparisons.*
 
 /**
diff --git a/js/js.libraries/src/generated/org.khronos.webgl.kt b/js/js.libraries/src/generated/org.khronos.webgl.kt
@@ -7,6 +7,7 @@
 
 package org.khronos.webgl
 
+import kotlin.js.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
 import org.w3c.dom.events.*
diff --git a/js/js.libraries/src/generated/org.w3c.dom.css.kt b/js/js.libraries/src/generated/org.w3c.dom.css.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.dom.css
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.events.*
diff --git a/js/js.libraries/src/generated/org.w3c.dom.events.kt b/js/js.libraries/src/generated/org.w3c.dom.events.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.dom.events
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
diff --git a/js/js.libraries/src/generated/org.w3c.dom.kt b/js/js.libraries/src/generated/org.w3c.dom.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.dom
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.css.*
 import org.w3c.dom.events.*
diff --git a/js/js.libraries/src/generated/org.w3c.dom.parsing.kt b/js/js.libraries/src/generated/org.w3c.dom.parsing.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.dom.parsing
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
diff --git a/js/js.libraries/src/generated/org.w3c.dom.svg.kt b/js/js.libraries/src/generated/org.w3c.dom.svg.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.dom.svg
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
diff --git a/js/js.libraries/src/generated/org.w3c.dom.url.kt b/js/js.libraries/src/generated/org.w3c.dom.url.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.dom.url
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
diff --git a/js/js.libraries/src/generated/org.w3c.fetch.kt b/js/js.libraries/src/generated/org.w3c.fetch.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.fetch
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
diff --git a/js/js.libraries/src/generated/org.w3c.files.kt b/js/js.libraries/src/generated/org.w3c.files.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.files
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
diff --git a/js/js.libraries/src/generated/org.w3c.notifications.kt b/js/js.libraries/src/generated/org.w3c.notifications.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.notifications
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
diff --git a/js/js.libraries/src/generated/org.w3c.performance.kt b/js/js.libraries/src/generated/org.w3c.performance.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.performance
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
diff --git a/js/js.libraries/src/generated/org.w3c.workers.kt b/js/js.libraries/src/generated/org.w3c.workers.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.workers
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
diff --git a/js/js.libraries/src/generated/org.w3c.xhr.kt b/js/js.libraries/src/generated/org.w3c.xhr.kt
@@ -7,6 +7,7 @@
 
 package org.w3c.xhr
 
+import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.css.*
diff --git a/libraries/tools/idl2k/src/main/kotlin/main.kt b/libraries/tools/idl2k/src/main/kotlin/main.kt
@@ -61,6 +61,7 @@ fun main(args: Array<String>) {
             w.appendln("package $pkg")
             w.appendln()
 
+            w.appendln("import kotlin.js.*")
             allPackages.filter { it != pkg }.forEach { import ->
                 w.appendln("import $import.*")
             }
diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
@@ -99,6 +99,9 @@ private fun List<ConcreteFunction>.writeTo(file: File, sourceFile: SourceFile, p
 
         writer.append("package ${sourceFile.packageName ?: "kotlin"}\n\n")
         writer.append("$COMMON_AUTOGENERATED_WARNING\n\n")
+        if (platform == Platform.JS) {
+            writer.appendln("import kotlin.js.*")
+        }
         writer.append("import kotlin.comparisons.*\n\n")
 
         for (f in this) {

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ fun main(args: Array<String>) {`
`61`	`61`	`w.appendln("package $pkg")`
`62`	`62`	`w.appendln()`
`63`	`63`
	`64`	`+ w.appendln("import kotlin.js.*")`
`64`	`65`	`allPackages.filter { it != pkg }.forEach { import ->`
`65`	`66`	`w.appendln("import $import.*")`
`66`	`67`	`}`