From 593684ecb628fb66e6c2fe3ec123f210a3bb3367 Mon Sep 17 00:00:00 2001 From: Alexey Trilis Date: Wed, 24 Jun 2020 01:39:17 +0300 Subject: [PATCH] Fix testdata after changing API of kotlin.browser and kotlin.dom --- .../multiplatform/useCorrectBuiltIns/js/js.kt | 4 +-- .../libraryPropertyJsRuntime.kt.after | 2 +- libraries/stdlib/api/js-v1/kotlin.browser.kt | 8 +++++ libraries/stdlib/api/js-v1/kotlin.dom.kt | 32 +++++++++++++++---- libraries/stdlib/api/js-v1/kotlinx.browser.kt | 7 ++++ libraries/stdlib/api/js-v1/kotlinx.dom.kt | 17 ++++++++++ libraries/stdlib/api/js/kotlin.browser.kt | 8 +++++ libraries/stdlib/api/js/kotlin.dom.kt | 32 +++++++++++++++---- 8 files changed, 93 insertions(+), 17 deletions(-) create mode 100644 libraries/stdlib/api/js-v1/kotlinx.browser.kt create mode 100644 libraries/stdlib/api/js-v1/kotlinx.dom.kt diff --git a/idea/testData/multiplatform/useCorrectBuiltIns/js/js.kt b/idea/testData/multiplatform/useCorrectBuiltIns/js/js.kt index 811702a466a..fe651f03f74 100644 --- a/idea/testData/multiplatform/useCorrectBuiltIns/js/js.kt +++ b/idea/testData/multiplatform/useCorrectBuiltIns/js/js.kt @@ -1,7 +1,7 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -import kotlin.browser.window -import kotlinx.cinterop.CPointed +import kotlinx.browser.window +import kotlinx.cinterop.CPointed fun jvmSpecific() { val x: Cloneable? = null diff --git a/idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt.after b/idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt.after index f64e1ccc221..5125b3295ce 100644 --- a/idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt.after +++ b/idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt.after @@ -3,7 +3,7 @@ package test -import kotlin.browser.localStorage +import kotlinx.browser.localStorage fun foo() { localStorage diff --git a/libraries/stdlib/api/js-v1/kotlin.browser.kt b/libraries/stdlib/api/js-v1/kotlin.browser.kt index 169a56b1f33..4f78560b631 100644 --- a/libraries/stdlib/api/js-v1/kotlin.browser.kt +++ b/libraries/stdlib/api/js-v1/kotlin.browser.kt @@ -1,7 +1,15 @@ +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.document' instead.", replaceWith = kotlin.ReplaceWith(expression = "document", imports = {"kotlinx.browser.document"})) +@kotlin.internal.LowPriorityInOverloadResolution public external val document: org.w3c.dom.Document { get; } +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.localStorage' instead.", replaceWith = kotlin.ReplaceWith(expression = "localStorage", imports = {"kotlinx.browser.localStorage"})) +@kotlin.internal.LowPriorityInOverloadResolution public external val localStorage: org.w3c.dom.Storage { get; } +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.sessionStorage' instead.", replaceWith = kotlin.ReplaceWith(expression = "sessionStorage", imports = {"kotlinx.browser.sessionStorage"})) +@kotlin.internal.LowPriorityInOverloadResolution public external val sessionStorage: org.w3c.dom.Storage { get; } +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.window' instead.", replaceWith = kotlin.ReplaceWith(expression = "window", imports = {"kotlinx.browser.window"})) +@kotlin.internal.LowPriorityInOverloadResolution public external val window: org.w3c.dom.Window { get; } \ No newline at end of file diff --git a/libraries/stdlib/api/js-v1/kotlin.dom.kt b/libraries/stdlib/api/js-v1/kotlin.dom.kt index cf7c97737fc..c4f95957c8a 100644 --- a/libraries/stdlib/api/js-v1/kotlin.dom.kt +++ b/libraries/stdlib/api/js-v1/kotlin.dom.kt @@ -1,17 +1,35 @@ +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.isElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.isElement", imports = {"kotlinx.dom.isElement"})) public val org.w3c.dom.Node.isElement: kotlin.Boolean { get; } +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.isText' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.isText", imports = {"kotlinx.dom.isText"})) public val org.w3c.dom.Node.isText: kotlin.Boolean { get; } -public fun org.w3c.dom.Element.addClass(vararg cssClasses: kotlin.String): kotlin.Boolean +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.addClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.addClass(cssClasses)", imports = {"kotlinx.dom.addClass"})) +public inline fun org.w3c.dom.Element.addClass(vararg cssClasses: kotlin.String): kotlin.Boolean -public fun org.w3c.dom.Element.appendElement(name: kotlin.String, init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.appendElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.appendElement(name, init)", imports = {"kotlinx.dom.appendElement"})) +public inline fun org.w3c.dom.Element.appendElement(name: kotlin.String, noinline init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element -public fun org.w3c.dom.Element.appendText(text: kotlin.String): org.w3c.dom.Element +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.appendText' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.appendText(text)", imports = {"kotlinx.dom.appendText"})) +public inline fun org.w3c.dom.Element.appendText(text: kotlin.String): org.w3c.dom.Element -public fun org.w3c.dom.Node.clear(): kotlin.Unit +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.clear' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.clear()", imports = {"kotlinx.dom.clear"})) +public inline fun org.w3c.dom.Node.clear(): kotlin.Unit -public fun org.w3c.dom.Document.createElement(name: kotlin.String, init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.createElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.createElement(name, init)", imports = {"kotlinx.dom.createElement"})) +public inline fun org.w3c.dom.Document.createElement(name: kotlin.String, noinline init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element -public fun org.w3c.dom.Element.hasClass(cssClass: kotlin.String): kotlin.Boolean +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.hasClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.hasClass(cssClass)", imports = {"kotlinx.dom.hasClass"})) +public inline fun org.w3c.dom.Element.hasClass(cssClass: kotlin.String): kotlin.Boolean -public fun org.w3c.dom.Element.removeClass(vararg cssClasses: kotlin.String): kotlin.Boolean \ No newline at end of file +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.removeClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.removeClass(cssClasses)", imports = {"kotlinx.dom.removeClass"})) +public inline fun org.w3c.dom.Element.removeClass(vararg cssClasses: kotlin.String): kotlin.Boolean \ No newline at end of file diff --git a/libraries/stdlib/api/js-v1/kotlinx.browser.kt b/libraries/stdlib/api/js-v1/kotlinx.browser.kt new file mode 100644 index 00000000000..81c53ca9307 --- /dev/null +++ b/libraries/stdlib/api/js-v1/kotlinx.browser.kt @@ -0,0 +1,7 @@ +/*∆*/ public external val document: org.w3c.dom.Document { get; } +/*∆*/ +/*∆*/ public external val localStorage: org.w3c.dom.Storage { get; } +/*∆*/ +/*∆*/ public external val sessionStorage: org.w3c.dom.Storage { get; } +/*∆*/ +/*∆*/ public external val window: org.w3c.dom.Window { get; } \ No newline at end of file diff --git a/libraries/stdlib/api/js-v1/kotlinx.dom.kt b/libraries/stdlib/api/js-v1/kotlinx.dom.kt new file mode 100644 index 00000000000..b031bebc855 --- /dev/null +++ b/libraries/stdlib/api/js-v1/kotlinx.dom.kt @@ -0,0 +1,17 @@ +/*∆*/ public val org.w3c.dom.Node.isElement: kotlin.Boolean { get; } +/*∆*/ +/*∆*/ public val org.w3c.dom.Node.isText: kotlin.Boolean { get; } +/*∆*/ +/*∆*/ public fun org.w3c.dom.Element.addClass(vararg cssClasses: kotlin.String): kotlin.Boolean +/*∆*/ +/*∆*/ public fun org.w3c.dom.Element.appendElement(name: kotlin.String, init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element +/*∆*/ +/*∆*/ public fun org.w3c.dom.Element.appendText(text: kotlin.String): org.w3c.dom.Element +/*∆*/ +/*∆*/ public fun org.w3c.dom.Node.clear(): kotlin.Unit +/*∆*/ +/*∆*/ public fun org.w3c.dom.Document.createElement(name: kotlin.String, init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element +/*∆*/ +/*∆*/ public fun org.w3c.dom.Element.hasClass(cssClass: kotlin.String): kotlin.Boolean +/*∆*/ +/*∆*/ public fun org.w3c.dom.Element.removeClass(vararg cssClasses: kotlin.String): kotlin.Boolean \ No newline at end of file diff --git a/libraries/stdlib/api/js/kotlin.browser.kt b/libraries/stdlib/api/js/kotlin.browser.kt index 169a56b1f33..4f78560b631 100644 --- a/libraries/stdlib/api/js/kotlin.browser.kt +++ b/libraries/stdlib/api/js/kotlin.browser.kt @@ -1,7 +1,15 @@ +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.document' instead.", replaceWith = kotlin.ReplaceWith(expression = "document", imports = {"kotlinx.browser.document"})) +@kotlin.internal.LowPriorityInOverloadResolution public external val document: org.w3c.dom.Document { get; } +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.localStorage' instead.", replaceWith = kotlin.ReplaceWith(expression = "localStorage", imports = {"kotlinx.browser.localStorage"})) +@kotlin.internal.LowPriorityInOverloadResolution public external val localStorage: org.w3c.dom.Storage { get; } +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.sessionStorage' instead.", replaceWith = kotlin.ReplaceWith(expression = "sessionStorage", imports = {"kotlinx.browser.sessionStorage"})) +@kotlin.internal.LowPriorityInOverloadResolution public external val sessionStorage: org.w3c.dom.Storage { get; } +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.window' instead.", replaceWith = kotlin.ReplaceWith(expression = "window", imports = {"kotlinx.browser.window"})) +@kotlin.internal.LowPriorityInOverloadResolution public external val window: org.w3c.dom.Window { get; } \ No newline at end of file diff --git a/libraries/stdlib/api/js/kotlin.dom.kt b/libraries/stdlib/api/js/kotlin.dom.kt index cf7c97737fc..c4f95957c8a 100644 --- a/libraries/stdlib/api/js/kotlin.dom.kt +++ b/libraries/stdlib/api/js/kotlin.dom.kt @@ -1,17 +1,35 @@ +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.isElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.isElement", imports = {"kotlinx.dom.isElement"})) public val org.w3c.dom.Node.isElement: kotlin.Boolean { get; } +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.isText' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.isText", imports = {"kotlinx.dom.isText"})) public val org.w3c.dom.Node.isText: kotlin.Boolean { get; } -public fun org.w3c.dom.Element.addClass(vararg cssClasses: kotlin.String): kotlin.Boolean +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.addClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.addClass(cssClasses)", imports = {"kotlinx.dom.addClass"})) +public inline fun org.w3c.dom.Element.addClass(vararg cssClasses: kotlin.String): kotlin.Boolean -public fun org.w3c.dom.Element.appendElement(name: kotlin.String, init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.appendElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.appendElement(name, init)", imports = {"kotlinx.dom.appendElement"})) +public inline fun org.w3c.dom.Element.appendElement(name: kotlin.String, noinline init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element -public fun org.w3c.dom.Element.appendText(text: kotlin.String): org.w3c.dom.Element +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.appendText' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.appendText(text)", imports = {"kotlinx.dom.appendText"})) +public inline fun org.w3c.dom.Element.appendText(text: kotlin.String): org.w3c.dom.Element -public fun org.w3c.dom.Node.clear(): kotlin.Unit +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.clear' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.clear()", imports = {"kotlinx.dom.clear"})) +public inline fun org.w3c.dom.Node.clear(): kotlin.Unit -public fun org.w3c.dom.Document.createElement(name: kotlin.String, init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.createElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.createElement(name, init)", imports = {"kotlinx.dom.createElement"})) +public inline fun org.w3c.dom.Document.createElement(name: kotlin.String, noinline init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element -public fun org.w3c.dom.Element.hasClass(cssClass: kotlin.String): kotlin.Boolean +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.hasClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.hasClass(cssClass)", imports = {"kotlinx.dom.hasClass"})) +public inline fun org.w3c.dom.Element.hasClass(cssClass: kotlin.String): kotlin.Boolean -public fun org.w3c.dom.Element.removeClass(vararg cssClasses: kotlin.String): kotlin.Boolean \ No newline at end of file +@kotlin.internal.LowPriorityInOverloadResolution +@kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.removeClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.removeClass(cssClasses)", imports = {"kotlinx.dom.removeClass"})) +public inline fun org.w3c.dom.Element.removeClass(vararg cssClasses: kotlin.String): kotlin.Boolean \ No newline at end of file