From 838c38467242424d89e98fe94ad8ed40585ec5f2 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 11 Sep 2014 16:33:01 +0400 Subject: [PATCH] "js" -> "kotlin.js" --- .../completion/basic/common/InEmptyImport.kt | 4 +- .../testData/completion/basic/js/InPackage.kt | 4 +- .../handlers/DoNotInsertDefaultJsImports.kt | 4 +- .../DoNotInsertDefaultJsImports.kt.after | 4 +- .../DefaultJsImports.after.kt | 4 +- .../DefaultJsImports/DefaultJsImports.kt | 6 +- .../analyze/TopDownAnalyzerFacadeForJS.java | 4 +- js/js.libraries/src/core/annotations.kt | 2 +- js/js.libraries/src/core/core.kt | 5 +- js/js.libraries/src/core/date.kt | 4 +- js/js.libraries/src/core/debug.kt | 6 +- js/js.libraries/src/core/dom.kt | 176 +++++++++--------- js/js.libraries/src/core/domEvents.kt | 22 +-- js/js.libraries/src/core/domViews.kt | 2 - js/js.libraries/src/core/htmlDom.kt | 2 +- js/js.libraries/src/core/javalang.kt | 1 - js/js.libraries/src/core/json.kt | 6 +- js/js.libraries/src/core/math.kt | 6 +- js/js.libraries/src/core/string.kt | 4 +- js/js.libraries/src/core/stringsCode.kt | 2 +- js/js.libraries/src/html5/canvas.kt | 6 +- js/js.libraries/src/html5/files.kt | 2 - js/js.libraries/src/html5/localstorage.kt | 4 +- js/js.libraries/src/jquery/common.kt | 2 +- js/js.libraries/src/jquery/ui.kt | 6 +- js/js.libraries/src/qunit/core.kt | 2 - .../factories/StringOperationFIF.java | 4 +- .../functions/factories/TopLevelFIF.java | 6 +- .../translate/utils/PredefinedAnnotation.java | 4 +- .../expression/misc/cases/intRange.kt | 2 - .../misc/cases/mainFunInNestedPackage.kt | 4 +- .../testData/jsTester/jsTester.kt | 3 +- .../testData/native/cases/class.kt | 4 +- .../testData/native/cases/classObject.kt | 4 +- .../testData/native/cases/simple.kt | 4 +- .../testData/native/cases/simpleUndefined.kt | 4 +- .../testData/native/cases/undefined.kt | 4 +- .../testData/native/cases/vararg.kt | 4 +- .../propertyAccess/cases/enumerable.kt | 5 +- .../testData/range/cases/explicitRange.kt | 2 - .../range/cases/iteratingOverRanges.kt | 2 - .../testData/range/cases/rangeSugarSyntax.kt | 2 - .../stdlib/cases/browserDocumentAccess.kt | 4 +- .../webDemoCanvasExamples/cases/Creatures.kt | 16 +- .../cases/Fancy lines.kt | 6 +- .../cases/Hello, Kotlin.kt | 6 +- .../cases/Traffic light.kt | 13 +- .../webDemoExamples2/cases/bottles.kt | 1 - .../testData/webDemoExamples2/cases/life.kt | 1 - .../src/generators/GenerateJavaScriptStubs.kt | 4 +- 50 files changed, 171 insertions(+), 228 deletions(-) diff --git a/idea/testData/completion/basic/common/InEmptyImport.kt b/idea/testData/completion/basic/common/InEmptyImport.kt index 164153c0bc0..9c08e14a2f5 100644 --- a/idea/testData/completion/basic/common/InEmptyImport.kt +++ b/idea/testData/completion/basic/common/InEmptyImport.kt @@ -4,5 +4,5 @@ import // EXIST: java, // EXIST_JAVA_ONLY: javax -// EXIST_JS_ONLY: js -// ABSENT: Array, Integer \ No newline at end of file +// EXIST_JS_ONLY: jquery, html5 +// ABSENT: Array, Integer diff --git a/idea/testData/completion/basic/js/InPackage.kt b/idea/testData/completion/basic/js/InPackage.kt index d81f8c666f1..52ce87e83f1 100644 --- a/idea/testData/completion/basic/js/InPackage.kt +++ b/idea/testData/completion/basic/js/InPackage.kt @@ -1,4 +1,4 @@ -package js. +package kotlin.js. // EXIST: dom -// ABSENT: Date, JSON, capitalize \ No newline at end of file +// ABSENT: Date, JSON, capitalize diff --git a/idea/testData/completion/handlers/DoNotInsertDefaultJsImports.kt b/idea/testData/completion/handlers/DoNotInsertDefaultJsImports.kt index f3346bb9f4a..b6fc6069ba8 100644 --- a/idea/testData/completion/handlers/DoNotInsertDefaultJsImports.kt +++ b/idea/testData/completion/handlers/DoNotInsertDefaultJsImports.kt @@ -2,5 +2,5 @@ fun main(args: Array) { println } -// For KT-3620: Don't auto-import js.* and remove in `optimize imports` -// JS \ No newline at end of file +// For KT-3620: Don't auto-import kotlin.js.* and remove in `optimize imports` +// JS diff --git a/idea/testData/completion/handlers/DoNotInsertDefaultJsImports.kt.after b/idea/testData/completion/handlers/DoNotInsertDefaultJsImports.kt.after index b0281749b13..4eeb6abd69c 100644 --- a/idea/testData/completion/handlers/DoNotInsertDefaultJsImports.kt.after +++ b/idea/testData/completion/handlers/DoNotInsertDefaultJsImports.kt.after @@ -2,5 +2,5 @@ fun main(args: Array) { println() } -// For KT-3620: Don't auto-import js.* and remove in `optimize imports` -// JS \ No newline at end of file +// For KT-3620: Don't auto-import kotlin.js.* and remove in `optimize imports` +// JS diff --git a/idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.after.kt b/idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.after.kt index d522ff63a54..8d14e6c8330 100644 --- a/idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.after.kt +++ b/idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.after.kt @@ -2,5 +2,5 @@ fun main(args: Array) { val a: Json? = null } -// For KT-3620 Don't auto-import js.* and remove in `optimize imports` -// JS \ No newline at end of file +// For KT-3620 Don't auto-import kotlin.js.* and remove in `optimize imports` +// JS diff --git a/idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.kt b/idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.kt index a6644787327..d28c8eb9519 100644 --- a/idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.kt +++ b/idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.kt @@ -1,8 +1,8 @@ -import js.Json +import kotlin.js.Json fun main(args: Array) { val a: Json? = null } -// For KT-3620 Don't auto-import js.* and remove in `optimize imports` -// JS \ No newline at end of file +// For KT-3620 Don't auto-import kotlin.js.* and remove in `optimize imports` +// JS diff --git a/js/js.frontend/src/org/jetbrains/k2js/analyze/TopDownAnalyzerFacadeForJS.java b/js/js.frontend/src/org/jetbrains/k2js/analyze/TopDownAnalyzerFacadeForJS.java index ed8fdbd5c92..71e5a16e468 100644 --- a/js/js.frontend/src/org/jetbrains/k2js/analyze/TopDownAnalyzerFacadeForJS.java +++ b/js/js.frontend/src/org/jetbrains/k2js/analyze/TopDownAnalyzerFacadeForJS.java @@ -41,9 +41,9 @@ import java.util.List; public final class TopDownAnalyzerFacadeForJS { public static final List DEFAULT_IMPORTS = ImmutableList.of( - new ImportPath("js.*"), new ImportPath("java.lang.*"), - new ImportPath("kotlin.*") + new ImportPath("kotlin.*"), + new ImportPath("kotlin.js.*") ); private TopDownAnalyzerFacadeForJS() { diff --git a/js/js.libraries/src/core/annotations.kt b/js/js.libraries/src/core/annotations.kt index 1a86d5a9095..3c234e37d4f 100644 --- a/js/js.libraries/src/core/annotations.kt +++ b/js/js.libraries/src/core/annotations.kt @@ -1,4 +1,4 @@ -package js; +package kotlin.js; native public annotation class native(name : String = "") diff --git a/js/js.libraries/src/core/core.kt b/js/js.libraries/src/core/core.kt index d2f32a65532..b5f7f4239df 100644 --- a/js/js.libraries/src/core/core.kt +++ b/js/js.libraries/src/core/core.kt @@ -1,9 +1,6 @@ -package js; +package kotlin.js; -import js.library -import js.native import java.util.*; -import java.lang.*; native public val noImpl : Nothing = throw Exception() diff --git a/js/js.libraries/src/core/date.kt b/js/js.libraries/src/core/date.kt index bf3cf339ad7..f9a77bff5ca 100644 --- a/js/js.libraries/src/core/date.kt +++ b/js/js.libraries/src/core/date.kt @@ -1,6 +1,6 @@ -package js +package kotlin.js native public class Date() { public fun getTime() : Int = js.noImpl -} \ No newline at end of file +} diff --git a/js/js.libraries/src/core/debug.kt b/js/js.libraries/src/core/debug.kt index a542b0f5b2d..c4591bf598c 100644 --- a/js/js.libraries/src/core/debug.kt +++ b/js/js.libraries/src/core/debug.kt @@ -1,6 +1,4 @@ -package js.debug - -import js.noImpl +package kotlin.js // https://developer.mozilla.org/en/DOM/console native trait Console { @@ -12,4 +10,4 @@ native trait Console { } native -val console:Console = noImpl \ No newline at end of file +val console:Console = noImpl diff --git a/js/js.libraries/src/core/dom.kt b/js/js.libraries/src/core/dom.kt index 55e16865569..ae72f816ad2 100644 --- a/js/js.libraries/src/core/dom.kt +++ b/js/js.libraries/src/core/dom.kt @@ -8,8 +8,6 @@ package org.w3c.dom // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import js.noImpl - // Contains stub APIs for the W3C DOM API so we can delegate to the platform DOM instead @@ -19,7 +17,7 @@ native public trait Attr: Node { public val schemaTypeInfo: TypeInfo public val specified: Boolean public var value: String - public fun isId(): Boolean = js.noImpl + public fun isId(): Boolean = noImpl } native public trait CDATASection: Text { @@ -28,11 +26,11 @@ native public trait CDATASection: Text { native public trait CharacterData: Node { public var data: String public val length: Int - public fun appendData(arg1: String?): Unit = js.noImpl - public fun deleteData(arg1: Int, arg2: Int): Unit = js.noImpl - public fun insertData(arg1: Int, arg2: String?): Unit = js.noImpl - public fun replaceData(arg1: Int, arg2: Int, arg3: String?): Unit = js.noImpl - public fun substringData(arg1: Int, arg2: Int): String = js.noImpl + public fun appendData(arg1: String?): Unit = noImpl + public fun deleteData(arg1: Int, arg2: Int): Unit = noImpl + public fun insertData(arg1: Int, arg2: String?): Unit = noImpl + public fun replaceData(arg1: Int, arg2: Int, arg3: String?): Unit = noImpl + public fun substringData(arg1: Int, arg2: Int): String = noImpl } native public trait Comment: CharacterData { @@ -49,23 +47,23 @@ native public trait Document: Node { public val xmlEncoding: String public var xmlStandalone: Boolean public var xmlVersion: String - public fun adoptNode(arg1: Node): Node = js.noImpl - public fun createAttribute(arg1: String?): Attr = js.noImpl - public fun createAttributeNS(arg1: String?, arg2: String?): Attr = js.noImpl - public fun createCDATASection(arg1: String?): CDATASection = js.noImpl - public fun createComment(arg1: String?): Comment = js.noImpl - public fun createDocumentFragment(): DocumentFragment = js.noImpl - public fun createElement(arg1: String?): Element = js.noImpl - public fun createElementNS(arg1: String?, arg2: String?): Element = js.noImpl - public fun createEntityReference(arg1: String?): EntityReference = js.noImpl - public fun createProcessingInstruction(arg1: String?, arg2: String?): ProcessingInstruction = js.noImpl - public fun createTextNode(arg1: String?): Text = js.noImpl - public fun getElementById(arg1: String?): Element = js.noImpl - public fun getElementsByTagName(arg1: String?): NodeList = js.noImpl - public fun getElementsByTagNameNS(arg1: String?, arg2: String?): NodeList = js.noImpl - public fun importNode(arg1: Node, arg2: Boolean): Node = js.noImpl - public fun normalizeDocument(): Unit = js.noImpl - public fun renameNode(arg1: Node, arg2: String?, arg3: String?): Node = js.noImpl + public fun adoptNode(arg1: Node): Node = noImpl + public fun createAttribute(arg1: String?): Attr = noImpl + public fun createAttributeNS(arg1: String?, arg2: String?): Attr = noImpl + public fun createCDATASection(arg1: String?): CDATASection = noImpl + public fun createComment(arg1: String?): Comment = noImpl + public fun createDocumentFragment(): DocumentFragment = noImpl + public fun createElement(arg1: String?): Element = noImpl + public fun createElementNS(arg1: String?, arg2: String?): Element = noImpl + public fun createEntityReference(arg1: String?): EntityReference = noImpl + public fun createProcessingInstruction(arg1: String?, arg2: String?): ProcessingInstruction = noImpl + public fun createTextNode(arg1: String?): Text = noImpl + public fun getElementById(arg1: String?): Element = noImpl + public fun getElementsByTagName(arg1: String?): NodeList = noImpl + public fun getElementsByTagNameNS(arg1: String?, arg2: String?): NodeList = noImpl + public fun importNode(arg1: Node, arg2: Boolean): Node = noImpl + public fun normalizeDocument(): Unit = noImpl + public fun renameNode(arg1: Node, arg2: String?, arg3: String?): Node = noImpl } native public trait DocumentFragment: Node { @@ -82,9 +80,9 @@ native public trait DocumentType: Node { native public trait DOMConfiguration { public val parameterNames: DOMStringList - public fun canSetParameter(arg1: String?, arg2: Any): Boolean = js.noImpl - public fun getParameter(arg1: String?): Any = js.noImpl - public fun setParameter(arg1: String?, arg2: Any): Unit = js.noImpl + public fun canSetParameter(arg1: String?, arg2: Any): Boolean = noImpl + public fun getParameter(arg1: String?): Any = noImpl + public fun setParameter(arg1: String?, arg2: Any): Unit = noImpl } native public trait DOMError { @@ -103,19 +101,19 @@ native public trait DOMError { } native public trait DOMErrorHandler { - public fun handleError(arg1: DOMError): Boolean = js.noImpl + public fun handleError(arg1: DOMError): Boolean = noImpl } native public trait DOMImplementation { - public fun createDocument(arg1: String?, arg2: String?, arg3: DocumentType?): Document = js.noImpl - public fun createDocumentType(arg1: String?, arg2: String?, arg3: String?): DocumentType = js.noImpl - public fun getFeature(arg1: String?, arg2: String?): Any = js.noImpl - public fun hasFeature(arg1: String?, arg2: String?): Boolean = js.noImpl + public fun createDocument(arg1: String?, arg2: String?, arg3: DocumentType?): Document = noImpl + public fun createDocumentType(arg1: String?, arg2: String?, arg3: String?): DocumentType = noImpl + public fun getFeature(arg1: String?, arg2: String?): Any = noImpl + public fun hasFeature(arg1: String?, arg2: String?): Boolean = noImpl } native public trait DOMImplementationList { public val length: Int - public fun item(arg1: Int): DOMImplementation = js.noImpl + public fun item(arg1: Int): DOMImplementation = noImpl } native public trait DOMLocator { @@ -129,31 +127,31 @@ native public trait DOMLocator { native public trait DOMStringList { public val length: Int - public fun contains(arg1: String?): Boolean = js.noImpl - public fun item(arg1: Int): String = js.noImpl + public fun contains(arg1: String?): Boolean = noImpl + public fun item(arg1: Int): String = noImpl } native public trait Element: Node { public val schemaTypeInfo: TypeInfo public val tagName: String - public fun getAttribute(arg1: String?): String = js.noImpl - public fun getAttributeNS(arg1: String?, arg2: String?): String = js.noImpl - public fun getAttributeNode(arg1: String?): Attr = js.noImpl - public fun getAttributeNodeNS(arg1: String?, arg2: String?): Attr = js.noImpl - public fun getElementsByTagName(arg1: String?): NodeList = js.noImpl - public fun getElementsByTagNameNS(arg1: String?, arg2: String?): NodeList = js.noImpl - public fun hasAttribute(arg1: String?): Boolean = js.noImpl - public fun hasAttributeNS(arg1: String?, arg2: String?): Boolean = js.noImpl - public fun removeAttribute(arg1: String?): Unit = js.noImpl - public fun removeAttributeNS(arg1: String?, arg2: String?): Unit = js.noImpl - public fun removeAttributeNode(arg1: Attr): Attr = js.noImpl - public fun setAttribute(arg1: String?, arg2: String?): Unit = js.noImpl - public fun setAttributeNS(arg1: String?, arg2: String?, arg3: String?): Unit = js.noImpl - public fun setIdAttribute(arg1: String?, arg2: Boolean): Unit = js.noImpl - public fun setIdAttributeNS(arg1: String?, arg2: String?, arg3: Boolean): Unit = js.noImpl - public fun setIdAttributeNode(arg1: Attr, arg2: Boolean): Unit = js.noImpl - public fun setAttributeNode(arg1: Attr): Attr = js.noImpl - public fun setAttributeNodeNS(arg1: Attr): Attr = js.noImpl + public fun getAttribute(arg1: String?): String = noImpl + public fun getAttributeNS(arg1: String?, arg2: String?): String = noImpl + public fun getAttributeNode(arg1: String?): Attr = noImpl + public fun getAttributeNodeNS(arg1: String?, arg2: String?): Attr = noImpl + public fun getElementsByTagName(arg1: String?): NodeList = noImpl + public fun getElementsByTagNameNS(arg1: String?, arg2: String?): NodeList = noImpl + public fun hasAttribute(arg1: String?): Boolean = noImpl + public fun hasAttributeNS(arg1: String?, arg2: String?): Boolean = noImpl + public fun removeAttribute(arg1: String?): Unit = noImpl + public fun removeAttributeNS(arg1: String?, arg2: String?): Unit = noImpl + public fun removeAttributeNode(arg1: Attr): Attr = noImpl + public fun setAttribute(arg1: String?, arg2: String?): Unit = noImpl + public fun setAttributeNS(arg1: String?, arg2: String?, arg3: String?): Unit = noImpl + public fun setIdAttribute(arg1: String?, arg2: Boolean): Unit = noImpl + public fun setIdAttributeNS(arg1: String?, arg2: String?, arg3: Boolean): Unit = noImpl + public fun setIdAttributeNode(arg1: Attr, arg2: Boolean): Unit = noImpl + public fun setAttributeNode(arg1: Attr): Attr = noImpl + public fun setAttributeNodeNS(arg1: Attr): Attr = noImpl } native public trait Entity: Node { @@ -170,21 +168,21 @@ native public trait EntityReference: Node { native public trait NameList { public val length: Int - public fun contains(arg1: String?): Boolean = js.noImpl - public fun containsNS(arg1: String?, arg2: String?): Boolean = js.noImpl - public fun getName(arg1: Int): String = js.noImpl - public fun getNamespaceURI(arg1: Int): String = js.noImpl + public fun contains(arg1: String?): Boolean = noImpl + public fun containsNS(arg1: String?, arg2: String?): Boolean = noImpl + public fun getName(arg1: Int): String = noImpl + public fun getNamespaceURI(arg1: Int): String = noImpl } native public trait NamedNodeMap { public val length: Int - public fun getNamedItem(arg1: String?): Node = js.noImpl - public fun getNamedItemNS(arg1: String?, arg2: String?): Node = js.noImpl - public fun item(arg1: Int): Node = js.noImpl - public fun removeNamedItem(arg1: String?): Node = js.noImpl - public fun removeNamedItemNS(arg1: String?, arg2: String?): Node = js.noImpl - public fun setNamedItem(arg1: Node): Node = js.noImpl - public fun setNamedItemNS(arg1: Node): Node = js.noImpl + public fun getNamedItem(arg1: String?): Node = noImpl + public fun getNamedItemNS(arg1: String?, arg2: String?): Node = noImpl + public fun item(arg1: Int): Node = noImpl + public fun removeNamedItem(arg1: String?): Node = noImpl + public fun removeNamedItemNS(arg1: String?, arg2: String?): Node = noImpl + public fun setNamedItem(arg1: Node): Node = noImpl + public fun setNamedItemNS(arg1: Node): Node = noImpl } native public trait Node { @@ -204,24 +202,24 @@ native public trait Node { public var prefix: String public val previousSibling: Node public var textContent: String - public fun appendChild(arg1: Node): Node = js.noImpl - public fun cloneNode(arg1: Boolean): Node = js.noImpl - public fun compareDocumentPosition(arg1: Node): Short = js.noImpl - public fun getFeature(arg1: String?, arg2: String?): Any = js.noImpl - public fun getUserData(arg1: String?): Any = js.noImpl - public fun hasAttributes(): Boolean = js.noImpl - public fun hasChildNodes(): Boolean = js.noImpl - public fun insertBefore(arg1: Node, arg2: Node): Node = js.noImpl - public fun isDefaultNamespace(arg1: String?): Boolean = js.noImpl - public fun isEqualNode(arg1: Node): Boolean = js.noImpl - public fun isSameNode(arg1: Node): Boolean = js.noImpl - public fun isSupported(arg1: String?, arg2: String?): Boolean = js.noImpl - public fun lookupNamespaceURI(arg1: String?): String = js.noImpl - public fun lookupPrefix(arg1: String?): String = js.noImpl - public fun normalize(): Unit = js.noImpl - public fun removeChild(arg1: Node): Node = js.noImpl - public fun replaceChild(arg1: Node, arg2: Node): Node = js.noImpl - public fun setUserData(arg1: String?, arg2: Any, arg3: UserDataHandler): Any = js.noImpl + public fun appendChild(arg1: Node): Node = noImpl + public fun cloneNode(arg1: Boolean): Node = noImpl + public fun compareDocumentPosition(arg1: Node): Short = noImpl + public fun getFeature(arg1: String?, arg2: String?): Any = noImpl + public fun getUserData(arg1: String?): Any = noImpl + public fun hasAttributes(): Boolean = noImpl + public fun hasChildNodes(): Boolean = noImpl + public fun insertBefore(arg1: Node, arg2: Node): Node = noImpl + public fun isDefaultNamespace(arg1: String?): Boolean = noImpl + public fun isEqualNode(arg1: Node): Boolean = noImpl + public fun isSameNode(arg1: Node): Boolean = noImpl + public fun isSupported(arg1: String?, arg2: String?): Boolean = noImpl + public fun lookupNamespaceURI(arg1: String?): String = noImpl + public fun lookupPrefix(arg1: String?): String = noImpl + public fun normalize(): Unit = noImpl + public fun removeChild(arg1: Node): Node = noImpl + public fun replaceChild(arg1: Node, arg2: Node): Node = noImpl + public fun setUserData(arg1: String?, arg2: Any, arg3: UserDataHandler): Any = noImpl public class object { public val ATTRIBUTE_NODE: Short = 2 @@ -247,7 +245,7 @@ native public trait Node { native public trait NodeList { public val length: Int - public fun item(arg1: Int): Node = js.noImpl + public fun item(arg1: Int): Node = noImpl } native public trait Notation: Node { @@ -262,15 +260,15 @@ native public trait ProcessingInstruction: Node { native public trait Text: CharacterData { public val wholeText: String - public fun isElementContentWhitespace(): Boolean = js.noImpl - public fun replaceWholeText(arg1: String?): Text = js.noImpl - public fun splitText(arg1: Int): Text = js.noImpl + public fun isElementContentWhitespace(): Boolean = noImpl + public fun replaceWholeText(arg1: String?): Text = noImpl + public fun splitText(arg1: Int): Text = noImpl } native public trait TypeInfo { public val typeName: String public val typeNamespace: String - public fun isDerivedFrom(arg1: String?, arg2: String?, arg3: Int): Boolean = js.noImpl + public fun isDerivedFrom(arg1: String?, arg2: String?, arg3: Int): Boolean = noImpl public class object { public val DERIVATION_EXTENSION: Int = 2 @@ -281,7 +279,7 @@ native public trait TypeInfo { } native public trait UserDataHandler { - public fun handle(arg1: Short, arg2: String?, arg3: Any, arg4: Node, arg5: Node): Unit = js.noImpl + public fun handle(arg1: Short, arg2: String?, arg3: Any, arg4: Node, arg5: Node): Unit = noImpl public class object { public val NODE_ADOPTED: Short = 5 diff --git a/js/js.libraries/src/core/domEvents.kt b/js/js.libraries/src/core/domEvents.kt index cc17a52de40..16d6d41988b 100644 --- a/js/js.libraries/src/core/domEvents.kt +++ b/js/js.libraries/src/core/domEvents.kt @@ -10,13 +10,11 @@ import org.w3c.dom.views.* // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import js.noImpl - // Contains stub APIs for the W3C DOM API so we can delegate to the platform DOM instead native public trait DocumentEvent { - public fun createEvent(arg1: String?): Event = js.noImpl + public fun createEvent(arg1: String?): Event = noImpl } native public trait Event { @@ -27,9 +25,9 @@ native public trait Event { public val eventPhase: Short public val target: EventTarget public val timeStamp: Long - public fun initEvent(arg1: String?, arg2: Boolean, arg3: Boolean): Unit = js.noImpl - public fun preventDefault(): Unit = js.noImpl - public fun stopPropagation(): Unit = js.noImpl + public fun initEvent(arg1: String?, arg2: Boolean, arg3: Boolean): Unit = noImpl + public fun preventDefault(): Unit = noImpl + public fun stopPropagation(): Unit = noImpl public class object { public val AT_TARGET: Short = 2 @@ -39,9 +37,9 @@ native public trait Event { } native public trait EventTarget { - public fun addEventListener(arg1: String?, arg2: EventListener, arg3: Boolean): Unit = js.noImpl - public fun dispatchEvent(arg1: Event?): Boolean = js.noImpl - public fun removeEventListener(arg1: String?, arg2: EventListener, arg3: Boolean): Unit = js.noImpl + public fun addEventListener(arg1: String?, arg2: EventListener, arg3: Boolean): Unit = noImpl + public fun dispatchEvent(arg1: Event?): Boolean = noImpl + public fun removeEventListener(arg1: String?, arg2: EventListener, arg3: Boolean): Unit = noImpl } native public trait MouseEvent: UIEvent { @@ -55,7 +53,7 @@ native public trait MouseEvent: UIEvent { public val screenX: Int public val screenY: Int public val shiftKey: Boolean - public fun initMouseEvent(arg1: String?, arg2: Boolean, arg3: Boolean, arg4: AbstractView, arg5: Int, arg6: Int, arg7: Int, arg8: Int, arg9: Int, arg10: Boolean, arg11: Boolean, arg12: Boolean, arg13: Boolean, arg14: Short, arg15: EventTarget): Unit = js.noImpl + public fun initMouseEvent(arg1: String?, arg2: Boolean, arg3: Boolean, arg4: AbstractView, arg5: Int, arg6: Int, arg7: Int, arg8: Int, arg9: Int, arg10: Boolean, arg11: Boolean, arg12: Boolean, arg13: Boolean, arg14: Short, arg15: EventTarget): Unit = noImpl } native public trait MutationEvent: Event { @@ -64,7 +62,7 @@ native public trait MutationEvent: Event { public val newValue: String public val prevValue: String public val relatedNode: Node - public fun initMutationEvent(arg1: String?, arg2: Boolean, arg3: Boolean, arg4: Node, arg5: String?, arg6: String?, arg7: String?, arg8: Short): Unit = js.noImpl + public fun initMutationEvent(arg1: String?, arg2: Boolean, arg3: Boolean, arg4: Node, arg5: String?, arg6: String?, arg7: String?, arg8: Short): Unit = noImpl public class object { public val ADDITION: Short = 2 @@ -76,6 +74,6 @@ native public trait MutationEvent: Event { native public trait UIEvent: Event { public val detail: Int public val view: AbstractView - public fun initUIEvent(arg1: String?, arg2: Boolean, arg3: Boolean, arg4: AbstractView, arg5: Int): Unit = js.noImpl + public fun initUIEvent(arg1: String?, arg2: Boolean, arg3: Boolean, arg4: AbstractView, arg5: Int): Unit = noImpl } diff --git a/js/js.libraries/src/core/domViews.kt b/js/js.libraries/src/core/domViews.kt index 3c719c56b78..646fcd48c50 100644 --- a/js/js.libraries/src/core/domViews.kt +++ b/js/js.libraries/src/core/domViews.kt @@ -1,7 +1,5 @@ package org.w3c.dom.views -import js.noImpl - native public trait AbstractView { } diff --git a/js/js.libraries/src/core/htmlDom.kt b/js/js.libraries/src/core/htmlDom.kt index 72b66ffb35e..c1ff84924be 100644 --- a/js/js.libraries/src/core/htmlDom.kt +++ b/js/js.libraries/src/core/htmlDom.kt @@ -1,4 +1,4 @@ -package js.dom.html +package kotlin.js.dom.html import org.w3c.dom.* diff --git a/js/js.libraries/src/core/javalang.kt b/js/js.libraries/src/core/javalang.kt index df87315b7f0..0babc860020 100644 --- a/js/js.libraries/src/core/javalang.kt +++ b/js/js.libraries/src/core/javalang.kt @@ -1,7 +1,6 @@ package java.lang import java.io.IOException -import js.library native("Error") open public class Exception(message: String? = null): Throwable() {} diff --git a/js/js.libraries/src/core/json.kt b/js/js.libraries/src/core/json.kt index 84e64347b50..50ae063bd13 100644 --- a/js/js.libraries/src/core/json.kt +++ b/js/js.libraries/src/core/json.kt @@ -1,6 +1,4 @@ -package js - -import js.library +package kotlin.js native public class Json() { fun get(propertyName: String): Any? = js.noImpl @@ -31,4 +29,4 @@ public trait JsonClass { } native -public val JSON: JsonClass = noImpl \ No newline at end of file +public val JSON: JsonClass = noImpl diff --git a/js/js.libraries/src/core/math.kt b/js/js.libraries/src/core/math.kt index 682a3a8691f..1c3a8745949 100644 --- a/js/js.libraries/src/core/math.kt +++ b/js/js.libraries/src/core/math.kt @@ -1,6 +1,4 @@ -package js; - -import js.native +package kotlin.js; //TODO: declare using number native @@ -29,4 +27,4 @@ public class MathClass() { } native -public val Math: MathClass = MathClass(); \ No newline at end of file +public val Math: MathClass = MathClass(); diff --git a/js/js.libraries/src/core/string.kt b/js/js.libraries/src/core/string.kt index 292ec434dde..a5fd51f59a0 100644 --- a/js/js.libraries/src/core/string.kt +++ b/js/js.libraries/src/core/string.kt @@ -1,4 +1,4 @@ -package js +package kotlin.js native public fun String.startsWith(s: String): Boolean = noImpl native public fun String.endsWith(s: String): Boolean = noImpl @@ -173,4 +173,4 @@ native public fun String.toDouble() : Double = java.lang.Double.parseDouble(this native public fun String.toRegex(flags: Int=0): java.util.regex.Pattern { return java.util.regex.Pattern.compile(this, flags)!! } -*/ \ No newline at end of file +*/ diff --git a/js/js.libraries/src/core/stringsCode.kt b/js/js.libraries/src/core/stringsCode.kt index d89e6b18245..ee66063672d 100644 --- a/js/js.libraries/src/core/stringsCode.kt +++ b/js/js.libraries/src/core/stringsCode.kt @@ -1,4 +1,4 @@ -package js +package kotlin.js public inline fun String.lastIndexOf(ch : Char, fromIndex : Int) : Int = lastIndexOf(ch.toString(), fromIndex) public inline fun String.lastIndexOf(ch: Char) : Int = lastIndexOf(ch.toString()) diff --git a/js/js.libraries/src/html5/canvas.kt b/js/js.libraries/src/html5/canvas.kt index d462f1f9d18..5f926aa37a1 100644 --- a/js/js.libraries/src/html5/canvas.kt +++ b/js/js.libraries/src/html5/canvas.kt @@ -1,8 +1,6 @@ -package js.dom.html5 +package kotlin.js.dom.html5 -import js.native -import js.noImpl -import js.dom.html.HTMLElement +import kotlin.js.dom.html.HTMLElement import org.w3c.dom.Element public native trait HTMLCanvasElement : HTMLElement { diff --git a/js/js.libraries/src/html5/files.kt b/js/js.libraries/src/html5/files.kt index 8e05d2af4ef..85bf7e706b2 100644 --- a/js/js.libraries/src/html5/files.kt +++ b/js/js.libraries/src/html5/files.kt @@ -1,7 +1,5 @@ package html5.files -import js.native - native class FileReader() { var onloadend : ((FileReaderEvent)->Unit)? = js.noImpl // diff --git a/js/js.libraries/src/html5/localstorage.kt b/js/js.libraries/src/html5/localstorage.kt index 35b00c8483c..545e440bd48 100644 --- a/js/js.libraries/src/html5/localstorage.kt +++ b/js/js.libraries/src/html5/localstorage.kt @@ -1,11 +1,9 @@ package html5.localstorage -import js.native - native val localStorage : LocalStorageClass = js.noImpl native class LocalStorageClass() { fun getItem(key : String) : Any? = js.noImpl fun setItem(key : String, value : Any?) : Unit = js.noImpl -} \ No newline at end of file +} diff --git a/js/js.libraries/src/jquery/common.kt b/js/js.libraries/src/jquery/common.kt index 7fa61e43733..cd503f51676 100644 --- a/js/js.libraries/src/jquery/common.kt +++ b/js/js.libraries/src/jquery/common.kt @@ -1,4 +1,4 @@ -package js.jquery; +package jquery; import org.w3c.dom.Element diff --git a/js/js.libraries/src/jquery/ui.kt b/js/js.libraries/src/jquery/ui.kt index 6421753a469..8c3a80f2f22 100644 --- a/js/js.libraries/src/jquery/ui.kt +++ b/js/js.libraries/src/jquery/ui.kt @@ -1,10 +1,8 @@ -package js.jquery.ui +package jquery.ui //jquery UI -import js.jquery.JQuery -import js.native -import js.Json +import jquery.JQuery native fun JQuery.buttonset() : JQuery = js.noImpl; diff --git a/js/js.libraries/src/qunit/core.kt b/js/js.libraries/src/qunit/core.kt index 0a932b6d030..a89aa020886 100644 --- a/js/js.libraries/src/qunit/core.kt +++ b/js/js.libraries/src/qunit/core.kt @@ -1,7 +1,5 @@ package QUnit -import js.native - /** * The [QUnit](http://qunitjs.com/) API */ diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java index 05ba9c0eb6e..7bcf3f40fa1 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java @@ -27,7 +27,7 @@ public final class StringOperationFIF extends CompositeFIF { private StringOperationFIF() { add(pattern("kotlin", "String", "get"), new BuiltInFunctionIntrinsic("charAt")); - add(pattern("js", "length").isExtensionOf("kotlin.CharSequence"), LENGTH_PROPERTY_INTRINSIC); - add(pattern("js", "isEmpty").isExtensionOf("kotlin.CharSequence"), IS_EMPTY_INTRINSIC); + add(pattern("kotlin.js", "length").isExtensionOf("kotlin.CharSequence"), LENGTH_PROPERTY_INTRINSIC); + add(pattern("kotlin.js", "isEmpty").isExtensionOf("kotlin.CharSequence"), IS_EMPTY_INTRINSIC); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java index 6e712ceec86..692dc2b7024 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java @@ -170,13 +170,13 @@ public final class TopLevelFIF extends CompositeFIF { add(pattern("kotlin", "iterator").isExtensionOf("kotlin.Iterator"), RETURN_RECEIVER_INTRINSIC); add(pattern("kotlin", "Map", "get").checkOverridden(), NATIVE_MAP_GET); - add(pattern("js", "set").isExtensionOf("kotlin.MutableMap"), NATIVE_MAP_SET); + add(pattern("kotlin.js", "set").isExtensionOf("kotlin.MutableMap"), NATIVE_MAP_SET); add(pattern("java.util", "HashMap", ""), new MapSelectImplementationIntrinsic(false)); add(pattern("java.util", "HashSet", ""), new MapSelectImplementationIntrinsic(true)); - add(pattern("js", "Json", "get"), ArrayFIF.GET_INTRINSIC); - add(pattern("js", "Json", "set"), ArrayFIF.SET_INTRINSIC); + add(pattern("kotlin.js", "Json", "get"), ArrayFIF.GET_INTRINSIC); + add(pattern("kotlin.js", "Json", "set"), ArrayFIF.SET_INTRINSIC); } private abstract static class NativeMapGetSet extends CallParametersAwareFunctionIntrinsic { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/PredefinedAnnotation.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/PredefinedAnnotation.java index bd2d317870a..2cfcbb18005 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/PredefinedAnnotation.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/PredefinedAnnotation.java @@ -19,8 +19,8 @@ package org.jetbrains.k2js.translate.utils; import org.jetbrains.annotations.NotNull; public enum PredefinedAnnotation { - LIBRARY("js.library"), - NATIVE("js.native"); + LIBRARY("kotlin.js.library"), + NATIVE("kotlin.js.native"); PredefinedAnnotation(@NotNull String fqName) { this.fqName = fqName; diff --git a/js/js.translator/testData/expression/misc/cases/intRange.kt b/js/js.translator/testData/expression/misc/cases/intRange.kt index c3d1c1cf5ab..b7123ab725e 100644 --- a/js/js.translator/testData/expression/misc/cases/intRange.kt +++ b/js/js.translator/testData/expression/misc/cases/intRange.kt @@ -1,7 +1,5 @@ package foo -import js.* - class RangeIterator(val start: Int, var count: Int, val reversed: Boolean) { var i = start diff --git a/js/js.translator/testData/expression/misc/cases/mainFunInNestedPackage.kt b/js/js.translator/testData/expression/misc/cases/mainFunInNestedPackage.kt index 3aa9dd2ed41..54ff3ab92cd 100644 --- a/js/js.translator/testData/expression/misc/cases/mainFunInNestedPackage.kt +++ b/js/js.translator/testData/expression/misc/cases/mainFunInNestedPackage.kt @@ -1,7 +1,5 @@ package a.b.c -import js.* - fun main(args: Array) { println("ayee") -} \ No newline at end of file +} diff --git a/js/js.translator/testData/jsTester/jsTester.kt b/js/js.translator/testData/jsTester/jsTester.kt index 65a8f7ee686..910de2a6933 100644 --- a/js/js.translator/testData/jsTester/jsTester.kt +++ b/js/js.translator/testData/jsTester/jsTester.kt @@ -1,7 +1,6 @@ package kotlin.test import kotlin.test.* -import js.* public var asserter: Asserter = JsTestsAsserter() @@ -24,4 +23,4 @@ public class JsTestsAsserter() : Asserter { } native("JsTests.assert") -public fun assert(value: Boolean, message: String): Unit = js.noImpl \ No newline at end of file +public fun assert(value: Boolean, message: String): Unit = js.noImpl diff --git a/js/js.translator/testData/native/cases/class.kt b/js/js.translator/testData/native/cases/class.kt index 26b42e537ea..c0dde2a0a29 100644 --- a/js/js.translator/testData/native/cases/class.kt +++ b/js/js.translator/testData/native/cases/class.kt @@ -1,7 +1,5 @@ package foo -import js.* - native class A(b: Int) { fun g(): Int = js.noImpl @@ -24,4 +22,4 @@ fun box(): Boolean { return false; } return true; -} \ No newline at end of file +} diff --git a/js/js.translator/testData/native/cases/classObject.kt b/js/js.translator/testData/native/cases/classObject.kt index 5b46f087521..0c3fb9b31d3 100644 --- a/js/js.translator/testData/native/cases/classObject.kt +++ b/js/js.translator/testData/native/cases/classObject.kt @@ -1,7 +1,5 @@ package foo -import js.* - native class A(val c: Int) { native @@ -17,4 +15,4 @@ fun box(): Boolean { if (A(2).c != 2) return false return true -} \ No newline at end of file +} diff --git a/js/js.translator/testData/native/cases/simple.kt b/js/js.translator/testData/native/cases/simple.kt index deec6621517..3b18e18f1bf 100644 --- a/js/js.translator/testData/native/cases/simple.kt +++ b/js/js.translator/testData/native/cases/simple.kt @@ -1,8 +1,6 @@ package foo -import js.* - native fun returnFalse(): Boolean = js.noImpl -fun box() = !returnFalse() \ No newline at end of file +fun box() = !returnFalse() diff --git a/js/js.translator/testData/native/cases/simpleUndefined.kt b/js/js.translator/testData/native/cases/simpleUndefined.kt index 14e0e1bace7..c7763c8191f 100644 --- a/js/js.translator/testData/native/cases/simpleUndefined.kt +++ b/js/js.translator/testData/native/cases/simpleUndefined.kt @@ -1,11 +1,9 @@ package foo -import js.* - native val c: Any? = js.noImpl fun box(): Boolean { if (c != null) return false return (c == null) -} \ No newline at end of file +} diff --git a/js/js.translator/testData/native/cases/undefined.kt b/js/js.translator/testData/native/cases/undefined.kt index 73987ce63cf..d858b09f5d4 100644 --- a/js/js.translator/testData/native/cases/undefined.kt +++ b/js/js.translator/testData/native/cases/undefined.kt @@ -1,7 +1,5 @@ package foo -import js.* - /*function g should return 0 if a parameter is undefined 1 if parameter is 1 and 3 if parameter is 3*/ native fun f(g: (Int?) -> Int): Boolean = js.noImpl @@ -21,4 +19,4 @@ fun box(): Boolean { } } return f(b) -} \ No newline at end of file +} diff --git a/js/js.translator/testData/native/cases/vararg.kt b/js/js.translator/testData/native/cases/vararg.kt index a28e0fc4d87..3950ff5fe8a 100644 --- a/js/js.translator/testData/native/cases/vararg.kt +++ b/js/js.translator/testData/native/cases/vararg.kt @@ -1,7 +1,5 @@ package foo -import js.* - native fun paramCount(vararg a: Int): Int = js.noImpl @@ -118,4 +116,4 @@ fun box(): String { return "failed when combined SureCall and SafeCall, maybe we lost cached expression" return "OK" -} \ No newline at end of file +} diff --git a/js/js.translator/testData/propertyAccess/cases/enumerable.kt b/js/js.translator/testData/propertyAccess/cases/enumerable.kt index 847ef407819..c818a902d23 100644 --- a/js/js.translator/testData/propertyAccess/cases/enumerable.kt +++ b/js/js.translator/testData/propertyAccess/cases/enumerable.kt @@ -1,8 +1,5 @@ package foo -import js.enumerable -import js.native - native fun _enumerate(o: T): T = noImpl @@ -27,4 +24,4 @@ fun box(): Boolean { return (100 == test.a && "s" == test.b) && p.a == 100 && _findFirst(object { val test = 100 }) == 100; -} \ No newline at end of file +} diff --git a/js/js.translator/testData/range/cases/explicitRange.kt b/js/js.translator/testData/range/cases/explicitRange.kt index 711a18241f0..f7332c903b6 100644 --- a/js/js.translator/testData/range/cases/explicitRange.kt +++ b/js/js.translator/testData/range/cases/explicitRange.kt @@ -1,7 +1,5 @@ package foo -import js.* - fun box(): Boolean { var twoToFive = IntRange(2, 5) diff --git a/js/js.translator/testData/range/cases/iteratingOverRanges.kt b/js/js.translator/testData/range/cases/iteratingOverRanges.kt index 3ae4c518897..8d3f28b032d 100644 --- a/js/js.translator/testData/range/cases/iteratingOverRanges.kt +++ b/js/js.translator/testData/range/cases/iteratingOverRanges.kt @@ -1,7 +1,5 @@ package foo -import js.* - fun box(): Boolean { var d = 0 diff --git a/js/js.translator/testData/range/cases/rangeSugarSyntax.kt b/js/js.translator/testData/range/cases/rangeSugarSyntax.kt index 34b1a4542da..be5367d9649 100644 --- a/js/js.translator/testData/range/cases/rangeSugarSyntax.kt +++ b/js/js.translator/testData/range/cases/rangeSugarSyntax.kt @@ -1,7 +1,5 @@ package foo -import js.* - fun box(): Boolean { var twoToFive = 2..5 diff --git a/js/js.translator/testData/stdlib/cases/browserDocumentAccess.kt b/js/js.translator/testData/stdlib/cases/browserDocumentAccess.kt index 009184443f5..bd6065c0906 100644 --- a/js/js.translator/testData/stdlib/cases/browserDocumentAccess.kt +++ b/js/js.translator/testData/stdlib/cases/browserDocumentAccess.kt @@ -1,6 +1,6 @@ package test.browser -import js.dom.html.document +import kotlin.js.dom.html.document import org.w3c.dom.Node fun box(): String { @@ -10,4 +10,4 @@ fun box(): String { if (textNode.nodeType != Node.TEXT_NODE) return "The type of the node is ${textNode.nodeType}, ${Node.TEXT_NODE} was expected" if (element.nodeType != Node.ELEMENT_NODE) return "The type of the node is ${element.nodeType}, ${Node.ELEMENT_NODE} was expected" return element.textContent -} \ No newline at end of file +} diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt index a5d04a03a4a..5fccda39be7 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt @@ -4,14 +4,14 @@ */ package creatures -import js.dom.html5.CanvasContext -import js.jquery.* -import js.dom.html5.CanvasGradient -import js.dom.html5.HTMLCanvasElement import java.util.ArrayList -import js.dom.html.window -import js.dom.html.HTMLElement -import js.dom.html.HTMLImageElement +import jquery.* +import kotlin.js.dom.html.window +import kotlin.js.dom.html.HTMLElement +import kotlin.js.dom.html.HTMLImageElement +import kotlin.js.dom.html5.CanvasContext +import kotlin.js.dom.html5.CanvasGradient +import kotlin.js.dom.html5.HTMLCanvasElement fun getImage(path: String): HTMLImageElement { @@ -353,4 +353,4 @@ fun List.reversed(): List { result.add(get(--i)) } return result -} \ No newline at end of file +} diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Fancy lines.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Fancy lines.kt index 2f718a39345..729bdf0540a 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/cases/Fancy lines.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Fancy lines.kt @@ -6,9 +6,9 @@ Note that only a subset of the api is supported for now. package fancylines -import js.dom.html5.* -import js.dom.html.window -import js.jquery.* +import kotlin.js.dom.html.window +import kotlin.js.dom.html5.* +import jquery.* fun main(args: Array) { jq { diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Hello, Kotlin.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Hello, Kotlin.kt index 54148539fb3..f8075958dd1 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/cases/Hello, Kotlin.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Hello, Kotlin.kt @@ -3,9 +3,9 @@ */ package hello -import js.dom.html5.* -import js.dom.html.window -import js.jquery.* +import kotlin.js.dom.html.window +import kotlin.js.dom.html5.* +import jquery.* val canvas: HTMLCanvasElement get() { diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt index e6de21ca6cb..e77d9b7b2fc 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt @@ -1,13 +1,12 @@ package traffic import java.util.ArrayList -import js.dom.html5.CanvasContext -import js.dom.html5.HTMLCanvasElement - -import js.dom.html.HTMLImageElement -import js.dom.html.window -import js.jquery.* -import js.dom.html.HTMLElement +import kotlin.js.dom.html5.CanvasContext +import kotlin.js.dom.html5.HTMLCanvasElement +import kotlin.js.dom.html.HTMLImageElement +import kotlin.js.dom.html.window +import kotlin.js.dom.html.HTMLElement +import jquery.* fun getImage(path: String): HTMLImageElement { val image = window.document.createElement("img") as HTMLImageElement diff --git a/js/js.translator/testData/webDemoExamples2/cases/bottles.kt b/js/js.translator/testData/webDemoExamples2/cases/bottles.kt index 8042783399f..4ea5c7fd74f 100644 --- a/js/js.translator/testData/webDemoExamples2/cases/bottles.kt +++ b/js/js.translator/testData/webDemoExamples2/cases/bottles.kt @@ -26,7 +26,6 @@ * Additionally, you can pass the desired initial number of bottles to use (rather than 99) * as a command-line argument */ -import js.* fun main(args: Array) { if (args.isEmpty()) { diff --git a/js/js.translator/testData/webDemoExamples2/cases/life.kt b/js/js.translator/testData/webDemoExamples2/cases/life.kt index 6bf30b98323..cb9a1c8528b 100644 --- a/js/js.translator/testData/webDemoExamples2/cases/life.kt +++ b/js/js.translator/testData/webDemoExamples2/cases/life.kt @@ -5,7 +5,6 @@ import java.util.* import java.util.Collections.max -import js.*; /* * A field where cells live. Effectively immutable diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateJavaScriptStubs.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateJavaScriptStubs.kt index 42f7007f32b..412056b94e2 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateJavaScriptStubs.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateJavaScriptStubs.kt @@ -66,8 +66,6 @@ $imports // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import js.noImpl - // Contains stub APIs for the W3C DOM API so we can delegate to the platform DOM instead """) @@ -145,7 +143,7 @@ import js.noImpl var counter = 0 val parameters = parameterTypes.map{ "arg${++counter}: ${parameterTypeName(it)}" }.makeString(", ") val returnType = simpleTypeName(method.getReturnType()) - println(" public fun ${method.getName()}($parameters): $returnType = js.noImpl") + println(" public fun ${method.getName()}($parameters): $returnType = noImpl") } } val fields = klass.getDeclaredFields().sortBy { it.getName()!! }