azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS: replace all usages of @native annotation with external modifier, in tests, stdlib, etc

Browse Source
This commit is contained in:
Alexey Andreev
2016-11-25 12:36:47 +03:00
parent e0cb56b3c3
commit 68412ae94f
173 changed files with 486 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithJsStdLib/module/dualModuleFromUmd.kt
Vendored
+2 -2
View File
@@ -5,14 +5,14 @@ package foo
import kotlin.js.*
@JsModule("A")
@native object A {
external object A {
fun f(): Int
val g: Int
}
@JsNonModule
@native open class B {
external open class B {
fun foo(): Int
}
compiler/testData/diagnostics/testsWithJsStdLib/module/dualModuleFromUmd.txt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ package bar {
package foo {
@kotlin.js.JsModule(import = "A") @kotlin.js.native public object A {
@kotlin.js.JsModule(import = "A") public external object A {
private constructor A()
public final val g: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,7 @@ package foo {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@kotlin.js.JsNonModule @kotlin.js.native public open class B {
@kotlin.js.JsNonModule public external open class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/module/jsModuleWithoutParameters.kt
Vendored
+4 -2
View File
@@ -2,6 +2,8 @@
// This should not crash
package foo
@JsModule @native fun foo(x: Int): Int
@JsModule
external fun foo(x: Int): Int
@JsModule(23) @native fun bar(x: Int): Int
@JsModule(23)
external fun bar(x: Int): Int
compiler/testData/diagnostics/testsWithJsStdLib/module/jsModuleWithoutParameters.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
package
package foo {
@kotlin.js.JsModule(import = 23) @kotlin.js.native public fun bar(/*0*/ x: kotlin.Int): kotlin.Int
@kotlin.js.JsModule @kotlin.js.native public fun foo(/*0*/ x: kotlin.Int): kotlin.Int
@kotlin.js.JsModule(import = 23) public external fun bar(/*0*/ x: kotlin.Int): kotlin.Int
@kotlin.js.JsModule public external fun foo(/*0*/ x: kotlin.Int): kotlin.Int
}
compiler/testData/diagnostics/testsWithJsStdLib/module/jsVarProhibited.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package foo
<!JS_MODULE_PROHIBITED_ON_VAR!>@JsModule("bar")
@native var bar: Int<!> = noImpl
external var bar: Int<!> = noImpl
<!JS_MODULE_PROHIBITED_ON_VAR!>@JsNonModule
@native var baz: Int<!> = noImpl
external var baz: Int<!> = noImpl
compiler/testData/diagnostics/testsWithJsStdLib/module/jsVarProhibited.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
package
package foo {
@kotlin.js.JsModule(import = "bar") @kotlin.js.native public var bar: kotlin.Int
@kotlin.js.JsNonModule @kotlin.js.native public var baz: kotlin.Int
@kotlin.js.JsModule(import = "bar") public external var bar: kotlin.Int
@kotlin.js.JsNonModule public external var baz: kotlin.Int
}
compiler/testData/diagnostics/testsWithJsStdLib/module/nestedProhibited.kt
Vendored
+5 -5
View File
@@ -2,16 +2,16 @@
package foo
@JsModule("A")
@native class <!NESTED_JS_MODULE_PROHIBITED!>A<!>
external class <!NESTED_JS_MODULE_PROHIBITED!>A<!>
@JsModule("B")
@native <!NESTED_JS_MODULE_PROHIBITED!>object B<!>
external <!NESTED_JS_MODULE_PROHIBITED!>object B<!>
<!NESTED_JS_MODULE_PROHIBITED!>@JsModule("foo")
@native fun foo()<!> = 23
external fun foo()<!> = 23
<!NESTED_JS_MODULE_PROHIBITED!>@JsModule("bar")
@native val bar<!> = 42
external val bar<!> = 42
<!NESTED_JS_MODULE_PROHIBITED!>@JsNonModule
@native val baz<!> = 99
external val baz<!> = 99
compiler/testData/diagnostics/testsWithJsStdLib/module/nestedProhibited.txt
Vendored
+5 -5
View File
@@ -1,18 +1,18 @@
package
package foo {
@kotlin.js.JsModule(import = "bar") @kotlin.js.native public val bar: kotlin.Int = 42
@kotlin.js.JsNonModule @kotlin.js.native public val baz: kotlin.Int = 99
@kotlin.js.JsModule(import = "foo") @kotlin.js.native public fun foo(): kotlin.Int
@kotlin.js.JsModule(import = "bar") public external val bar: kotlin.Int = 42
@kotlin.js.JsNonModule public external val baz: kotlin.Int = 99
@kotlin.js.JsModule(import = "foo") public external fun foo(): kotlin.Int
@kotlin.js.JsModule(import = "A") @kotlin.js.native public final class A {
@kotlin.js.JsModule(import = "A") public external final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@kotlin.js.JsModule(import = "B") @kotlin.js.native public object B {
@kotlin.js.JsModule(import = "B") public external object B {
private constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/module/nonTopLevelProhibited.kt
Vendored
-19
View File
@@ -1,19 +0,0 @@
package foo
class A {
<!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>@JsModule("foo")
@native fun foo(): Int<!>
}
object B {
<!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>@JsModule("foo")
@native fun bar(): Int<!>
}
fun baz() {
<!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>@JsModule("bzz")
@native fun bzz(): Int<!>
@JsModule("bzz")
@native class <!JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL!>C<!>
}
compiler/testData/diagnostics/testsWithJsStdLib/module/nonTopLevelProhibited.txt
Vendored
-21
View File
@@ -1,21 +0,0 @@
package
package foo {
public fun baz(): kotlin.Unit
public final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.js.JsModule(import = "foo") @kotlin.js.native public final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public object B {
private constructor B()
@kotlin.js.JsModule(import = "foo") @kotlin.js.native public final fun bar(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToModule.kt
Vendored
+5 -5
View File
@@ -5,19 +5,19 @@ package foo
import kotlin.js.*
@JsModule("A")
@native object A {
external object A {
fun f(): Int
val g: Int
}
@JsModule("B")
@native open class B {
external open class B {
fun foo(): Int
}
@JsModule("bar")
@native fun bar(): Unit
external fun bar(): Unit
// MODULE: m2(m1)
// FILE: b.kt
@@ -25,7 +25,7 @@ import kotlin.js.*
@file:JsModule("foo")
package foo
@native fun baz(): Unit
external fun baz(): Unit
// FILE: c.kt
package bar
@@ -39,4 +39,4 @@ fun box() {
<!CALL_TO_JS_MODULE_WITHOUT_MODULE_SYSTEM!>baz<!>()
}
@native class DerivedB : <!CALL_TO_JS_MODULE_WITHOUT_MODULE_SYSTEM!>B<!>()
external class DerivedB : <!CALL_TO_JS_MODULE_WITHOUT_MODULE_SYSTEM!>B<!>()
compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToModule.txt
Vendored
+5 -5
View File
@@ -2,9 +2,9 @@
package
package foo {
@kotlin.js.JsModule(import = "bar") @kotlin.js.native public fun bar(): kotlin.Unit
@kotlin.js.JsModule(import = "bar") public external fun bar(): kotlin.Unit
@kotlin.js.JsModule(import = "A") @kotlin.js.native public object A {
@kotlin.js.JsModule(import = "A") public external object A {
private constructor A()
public final val g: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -13,7 +13,7 @@ package foo {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@kotlin.js.JsModule(import = "B") @kotlin.js.native public open class B {
@kotlin.js.JsModule(import = "B") public external open class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Int
@@ -29,7 +29,7 @@ package
package bar {
public fun box(): kotlin.Unit
@kotlin.js.native public final class DerivedB : foo.B {
public external final class DerivedB : foo.B {
public constructor DerivedB()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
@@ -39,5 +39,5 @@ package bar {
}
package foo {
@kotlin.js.native public fun baz(): kotlin.Unit
public external fun baz(): kotlin.Unit
}
compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.kt
Vendored
+4 -4
View File
@@ -5,19 +5,19 @@ package foo
import kotlin.js.*
@JsNonModule
@native object A {
external object A {
fun f(): Int
val g: Int
}
@JsNonModule
@native open class B {
external open class B {
fun foo(): Int
}
@JsNonModule
@native fun bar(): Unit
external fun bar(): Unit
// MODULE: m2(m1)
// MODULE_KIND: AMD
@@ -33,4 +33,4 @@ fun box() {
<!CALL_TO_JS_NON_MODULE_WITH_MODULE_SYSTEM!>bar<!>()
}
@native class DerivedB : <!CALL_TO_JS_NON_MODULE_WITH_MODULE_SYSTEM!>B<!>()
external class DerivedB : <!CALL_TO_JS_NON_MODULE_WITH_MODULE_SYSTEM!>B<!>()
compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.txt
Vendored
+4 -4
View File
@@ -3,7 +3,7 @@ package
package bar {
public fun box(): kotlin.Unit
@kotlin.js.native public final class DerivedB : foo.B {
public external final class DerivedB : foo.B {
public constructor DerivedB()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
@@ -13,9 +13,9 @@ package bar {
}
package foo {
@kotlin.js.JsNonModule @kotlin.js.native public fun bar(): kotlin.Unit
@kotlin.js.JsNonModule public external fun bar(): kotlin.Unit
@kotlin.js.JsNonModule @kotlin.js.native public object A {
@kotlin.js.JsNonModule public external object A {
private constructor A()
public final val g: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -24,7 +24,7 @@ package foo {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@kotlin.js.JsNonModule @kotlin.js.native public open class B {
@kotlin.js.JsNonModule public external open class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Int