From 25c30645546bce2bef34ea454f693377e36e16d5 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 27 Jan 2017 23:25:05 +0300
Subject: [PATCH] Add explicit imports of kotlin.js.* to generated files.

---
 js/js.libraries/src/core/generated/_ArraysJs.kt                | 1 +
 js/js.libraries/src/core/generated/_CollectionsJs.kt           | 1 +
 js/js.libraries/src/core/generated/_ComparisonsJs.kt           | 1 +
 js/js.libraries/src/core/generated/_MapsJs.kt                  | 1 +
 js/js.libraries/src/core/generated/_RangesJs.kt                | 1 +
 js/js.libraries/src/core/generated/_SequencesJs.kt             | 1 +
 js/js.libraries/src/core/generated/_SetsJs.kt                  | 1 +
 js/js.libraries/src/core/generated/_StringsJs.kt               | 1 +
 js/js.libraries/src/generated/org.khronos.webgl.kt             | 1 +
 js/js.libraries/src/generated/org.w3c.dom.css.kt               | 1 +
 js/js.libraries/src/generated/org.w3c.dom.events.kt            | 1 +
 js/js.libraries/src/generated/org.w3c.dom.kt                   | 1 +
 js/js.libraries/src/generated/org.w3c.dom.parsing.kt           | 1 +
 js/js.libraries/src/generated/org.w3c.dom.svg.kt               | 1 +
 js/js.libraries/src/generated/org.w3c.dom.url.kt               | 1 +
 js/js.libraries/src/generated/org.w3c.fetch.kt                 | 1 +
 js/js.libraries/src/generated/org.w3c.files.kt                 | 1 +
 js/js.libraries/src/generated/org.w3c.notifications.kt         | 1 +
 js/js.libraries/src/generated/org.w3c.performance.kt           | 1 +
 js/js.libraries/src/generated/org.w3c.workers.kt               | 1 +
 js/js.libraries/src/generated/org.w3c.xhr.kt                   | 1 +
 libraries/tools/idl2k/src/main/kotlin/main.kt                  | 1 +
 .../kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt    | 3 +++
 23 files changed, 25 insertions(+)

diff --git a/js/js.libraries/src/core/generated/_ArraysJs.kt b/js/js.libraries/src/core/generated/_ArraysJs.kt
index 90380fd9765..9cace5d15ff 100644
--- 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
index 3831d9bc262..191fb76e87a 100644
--- 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
index beaceab2e6e..c606e293b23 100644
--- 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
index 96e2cb44159..02da5b759f7 100644
--- 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
index 3d435db167b..c72c20a4e64 100644
--- 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
index 5b987803920..4cde2fc23bb 100644
--- 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
index ac4ab1799ad..7912fa01519 100644
--- 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
index 0c4e72c4bdf..7621ed85cb0 100644
--- 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
index c950e063f40..b487ce32699 100644
--- 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
index 7e2ee25f4e0..f5c068c2353 100644
--- 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
index ea0038d467f..5f6d54c288e 100644
--- 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
index 5a69c30a5ff..1f9ba63e927 100644
--- 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
index a25b42e6546..acb1d90dfb6 100644
--- 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
index 9c94231983d..210d0c91f0f 100644
--- 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
index d4edfd295b7..807a425120d 100644
--- 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
index 9351d692257..5a0c3ec80ae 100644
--- 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
index f4471247f53..36af1ae107a 100644
--- 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
index 5c8e92ac8e2..9e1cd08811f 100644
--- 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
index e2f3c0decc3..fd4d77f97c0 100644
--- 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
index d0df6ce4233..42fbaa5ee8d 100644
--- 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
index fb54422501d..62eff47596a 100644
--- 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
index befba102cfc..8efe9f4b98b 100644
--- 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
index 813d0b48cf9..5009faf0021 100644
--- 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) {