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

2016-11-25 12:36:47 +03:00
parent e0cb56b3c3
commit 68412ae94f
173 changed files with 486 additions and 651 deletions
@@ -1,7 +1,7 @@
 // TARGET_BACKEND: JS
 package foo

-@native interface A {
+external interface A {
    fun foo(value: Int): String
 }

@@ -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
 }

@@ -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
@@ -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
@@ -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
 }
@@ -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
@@ -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
 }
@@ -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
@@ -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
@@ -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<!>
-}
@@ -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
-    }
-}
@@ -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<!>()
@@ -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
 }
@@ -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<!>()
@@ -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
@@ -1 +1,4 @@
-@native("B") <!JS_NAME_PROHIBITED_FOR_NAMED_NATIVE!>@JsName("C")<!> class A
+// !DIAGNOSTICS:  -DEPRECATION
+@native("B")
+<!JS_NAME_PROHIBITED_FOR_NAMED_NATIVE!>@JsName("C")<!>
+class A
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

 fun foo() {
    @nativeGetter
@@ -1,8 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun foo() {
-    @native
-    class A {
+    external class A {
        @nativeGetter
        fun get(a: String): Any? = null

@@ -13,14 +12,12 @@ fun foo() {
        fun foo(a: Double): String? = null
    }

-    @native
-    class B {
+    external class B {
        <!WRONG_ANNOTATION_TARGET!>@nativeGetter<!>
        val foo = 0
    }

-    @native
-    class C {
+    external class C {
        <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>@nativeGetter
        fun Int.get(a: String): Int?<!> = 1

@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION, -DEPRECATION

 fun foo() {
    class A {
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -NON_TOPLEVEL_CLASS_DECLARATION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -NON_TOPLEVEL_CLASS_DECLARATION, -DEPRECATION

 fun foo() {
    <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN, NATIVE_INDEXER_WRONG_PARAMETER_COUNT!>@nativeGetter
@@ -1,7 +1,6 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

-@native
-class A {
+external class A {
    @nativeGetter
    fun get(a: String): Any? = null

@@ -23,8 +22,7 @@ class A {
    }
 }

-@native
-class B {
+external class B {
    <!WRONG_ANNOTATION_TARGET!>@nativeGetter<!>
    val foo = 0

@@ -40,8 +38,7 @@ class B {
    }
 }

-@native
-class C {
+external class C {
    <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>@nativeGetter
    fun Int.get(a: String): Int?<!> = 1

@@ -1,6 +1,6 @@
 package

-@kotlin.js.native public final class A {
+public final class A {
    public constructor A()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    @kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
@@ -20,7 +20,7 @@ package
    }
 }

-@kotlin.js.native public final class B {
+public final class B {
    public constructor B()
    @kotlin.js.nativeGetter public final val foo: kotlin.Int = 0
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -50,7 +50,7 @@ package
    }
 }

-@kotlin.js.native public final class C {
+public final class C {
    public constructor C()
    @kotlin.js.nativeGetter public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
    @kotlin.js.nativeGetter public final fun baz(/*0*/ a: kotlin.String = ...): kotlin.Int?
@@ -1,7 +1,6 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

-@native
-class A {
+external class A {
    class B {
        class A {
            @nativeGetter
@@ -1,6 +1,6 @@
 package

-@kotlin.js.native public final class A {
+public 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
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION, -DEPRECATION

 class A {
    class B {
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

 class A {
    <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>@nativeGetter
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

@nativeGetter
 fun Int.get(a: String): Int? = 1
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

 <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN, NATIVE_INDEXER_WRONG_PARAMETER_COUNT!>@nativeGetter
 fun toplevelFun(): <!NATIVE_GETTER_RETURN_TYPE_SHOULD_BE_NULLABLE!>Any<!><!> = 0
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

 fun foo() {
    @nativeInvoke
@@ -1,8 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun foo() {
-    @native
-    class A {
+    external class A {
        @nativeInvoke
        fun foo() {}

@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION, -DEPRECATION

 fun foo() {
    class A {
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -NON_TOPLEVEL_CLASS_DECLARATION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -NON_TOPLEVEL_CLASS_DECLARATION, -DEPRECATION

 fun foo() {
    <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>@nativeInvoke
@@ -1,7 +1,6 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

-@native
-class A {
+external class A {
    @nativeInvoke
    fun foo() {}

@@ -1,6 +1,6 @@
 package

-@kotlin.js.native public final class A {
+public final class A {
    public constructor A()
    @kotlin.js.nativeInvoke public final val foo: kotlin.Int = 0
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,7 +1,6 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

-@native
-class A {
+external class A {
    class B {
        class C {
            @nativeInvoke
@@ -1,6 +1,6 @@
 package

-@kotlin.js.native public final class A {
+public 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
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION, -DEPRECATION

 class A {
    class B {
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

 class A {
    <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>@nativeInvoke
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

@nativeInvoke
 fun Int.ext() = 1
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

 <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>@nativeInvoke
 fun toplevelFun()<!> {}
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

 fun foo() {
    @nativeSetter
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

 fun foo() {
    @native
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION, -DEPRECATION

 fun foo() {
    class A {
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -NON_TOPLEVEL_CLASS_DECLARATION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -NON_TOPLEVEL_CLASS_DECLARATION, -DEPRECATION

 fun foo() {
    <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN, NATIVE_INDEXER_WRONG_PARAMETER_COUNT!>@nativeSetter
@@ -1,7 +1,6 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

-@native
-class A {
+external class A {
    @nativeSetter
    fun set(a: String, v: Any?): Any? = null

@@ -35,8 +34,7 @@ class A {
    }
 }

-@native
-class B {
+external class B {
    <!WRONG_ANNOTATION_TARGET!>@nativeSetter<!>
    val foo = 0

@@ -52,8 +50,7 @@ class B {
    }
 }

-@native
-class C {
+external class C {
    <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>@nativeSetter
    fun Int.set(a: String, v: Int)<!> {}

@@ -1,6 +1,6 @@
 package

-@kotlin.js.native public final class A {
+public final class A {
    public constructor A()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
@@ -24,7 +24,7 @@ package
    }
 }

-@kotlin.js.native public final class B {
+public final class B {
    public constructor B()
    @kotlin.js.nativeSetter public final val foo: kotlin.Int = 0
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -54,7 +54,7 @@ package
    }
 }

-@kotlin.js.native public final class C {
+public final class C {
    public constructor C()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    @kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String = ...): kotlin.String
@@ -1,7 +1,6 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

-@native
-class A {
+external class A {
    class B {
        class A {
            @nativeSetter
@@ -1,6 +1,6 @@
 package

-@kotlin.js.native public final class A {
+public 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
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -NON_TOPLEVEL_CLASS_DECLARATION, -DEPRECATION

 class A {
    class B {
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

 class A {
    <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN!>@nativeSetter
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

@nativeSetter
 fun Int.set(a: String, v: Int) {}
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -DEPRECATION

 <!NATIVE_ANNOTATIONS_ALLOWED_ONLY_ON_MEMBER_OR_EXTENSION_FUN, NATIVE_INDEXER_WRONG_PARAMETER_COUNT!>@nativeSetter
 fun toplevelFun(): Any<!> = 0
@@ -1,7 +1,7 @@
 class A {
-    <!NATIVE_INNER_CLASS_PROHIBITED!>@native inner class B<!>
+    <!NATIVE_INNER_CLASS_PROHIBITED!>external inner class B<!>
 }

-@native class C {
-    @native inner class D
+external class C {
+    inner external  class D
 }
@@ -6,7 +6,7 @@ public final class A {
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

-    @kotlin.js.native public final inner class B {
+    public final inner class B {
        public 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
@@ -14,13 +14,13 @@ public final class A {
    }
 }

-@kotlin.js.native public final class C {
+public final class C {
    public constructor C()
    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.native public final inner class D {
+    public final inner class D {
        public constructor D()
        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -1,26 +1,18 @@
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 // unreachable code suppressed due to KT-9586

-@native
-val baz: Int
-@native
-val boo: Int = noImpl
+external val baz: Int
+external val boo: Int = noImpl

-@native
-val Int.baz: Int
+external val Int.baz: Int

-@native
-fun foo()
-@native
-fun bar() {}
+external fun foo()
+external fun bar() {}

-@native
-fun String.foo(): Int
-@native
-fun String.bar(): Int = noImpl
+external fun String.foo(): Int
+external fun String.bar(): Int = noImpl

-@native
-interface T {
+external interface T {
    val baz: Int

    fun foo()
@@ -35,8 +27,7 @@ interface T {
    }
 }

-@native
-class C {
+external class C {
    val baz: Int
    val boo: Int = noImpl

@@ -52,8 +43,7 @@ class C {
    }
 }

-@native
-object O {
+external object O {
    val baz: Int
    val boo: Int = noImpl

@@ -62,8 +52,7 @@ object O {
 }

 fun test() {
-    @native
-    class Local {
+    external class Local {
        val baz: Int
        val boo: Int = noImpl

@@ -1,15 +1,15 @@
 package

-@kotlin.js.native public val baz: kotlin.Int
-@kotlin.js.native public val boo: kotlin.Int
-@kotlin.js.native public val kotlin.Int.baz: kotlin.Int
-@kotlin.js.native public fun bar(): kotlin.Unit
-@kotlin.js.native public fun foo(): kotlin.Unit
+public val baz: kotlin.Int
+public val boo: kotlin.Int
+public val kotlin.Int.baz: kotlin.Int
+public external fun bar(): kotlin.Unit
+public external fun foo(): kotlin.Unit
 public fun test(): kotlin.Unit
-@kotlin.js.native public fun kotlin.String.bar(): kotlin.Int
-@kotlin.js.native public fun kotlin.String.foo(): kotlin.Int
+public external fun kotlin.String.bar(): kotlin.Int
+public external fun kotlin.String.foo(): kotlin.Int

-@kotlin.js.native public final class C {
+public final class C {
    public constructor C()
    public final val baz: kotlin.Int
    public final val boo: kotlin.Int
@@ -31,7 +31,7 @@ public fun test(): kotlin.Unit
    }
 }

-@kotlin.js.native public object O {
+public object O {
    private constructor O()
    public final val baz: kotlin.Int
    public final val boo: kotlin.Int
@@ -42,7 +42,7 @@ public fun test(): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

-@kotlin.js.native public interface T {
+public interface T {
    public abstract val baz: kotlin.Int
    public open fun bar(): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,11 +1,11 @@
+// !DIAGNOSTICS: -DEPRECATION
@nativeGetter
 fun String.foo(n: Int): Int?
@nativeGetter
 fun String.bar(n: Int): Int? = noImpl


-@native
-interface T {
+external interface T {
    @nativeGetter
    fun foo(d: Double): String?
    @nativeGetter
@@ -3,7 +3,7 @@ package
@kotlin.js.nativeGetter public fun kotlin.String.bar(/*0*/ n: kotlin.Int): kotlin.Int?
@kotlin.js.nativeGetter public fun kotlin.String.foo(/*0*/ n: kotlin.Int): kotlin.Int?

-@kotlin.js.native public interface T {
+public interface T {
    @kotlin.js.nativeGetter public open fun bar(/*0*/ d: kotlin.Double): kotlin.String?
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    @kotlin.js.nativeGetter public abstract fun foo(/*0*/ d: kotlin.Double): kotlin.String?
@@ -1,11 +1,11 @@
+// !DIAGNOSTICS: -DEPRECATION
@nativeInvoke
 fun String.foo(): Int
@nativeInvoke
 fun String.bar(): Int = noImpl


-@native
-object O {
+external object O {
    @nativeInvoke
    fun foo()
    @nativeInvoke
@@ -3,7 +3,7 @@ package
@kotlin.js.nativeInvoke public fun kotlin.String.bar(): kotlin.Int
@kotlin.js.nativeInvoke public fun kotlin.String.foo(): kotlin.Int

-@kotlin.js.native public object O {
+public object O {
    private constructor O()
    @kotlin.js.nativeInvoke public final fun bar(): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,11 +1,11 @@
+// !DIAGNOSTICS: -DEPRECATION
@nativeSetter
 fun String.foo(n: Int, v: Any)
@nativeSetter
 fun String.bar(n: Int, v: Any) {}


-@native
-class C {
+external class C {
    @nativeSetter
    fun foo(d: Double, v: Any): Any
    @nativeSetter
@@ -3,7 +3,7 @@ package
@kotlin.js.nativeSetter public fun kotlin.String.bar(/*0*/ n: kotlin.Int, /*1*/ v: kotlin.Any): kotlin.Unit
@kotlin.js.nativeSetter public fun kotlin.String.foo(/*0*/ n: kotlin.Int, /*1*/ v: kotlin.Any): kotlin.Unit

-@kotlin.js.native public final class C {
+public final class C {
    public constructor C()
    @kotlin.js.nativeSetter public final fun bar(/*0*/ d: kotlin.Double, /*1*/ v: kotlin.Any): kotlin.Any
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,4 +1,4 @@
-@native interface I
+external interface I

 fun box(a: Any, b: Any): Pair<I, I?> {
    return Pair(<!UNCHECKED_CAST_TO_NATIVE_INTERFACE!>a as I<!>, <!UNCHECKED_CAST_TO_NATIVE_INTERFACE!>b as? I<!>)
@@ -2,7 +2,7 @@ package

 public fun box(/*0*/ a: kotlin.Any, /*1*/ b: kotlin.Any): kotlin.Pair<I, I?>

-@kotlin.js.native public interface I {
+public interface I {
    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
@@ -1,4 +1,4 @@
-@native interface I
+external interface I

 fun box(a: Any, b: Any): Boolean {
    return <!CANNOT_CHECK_FOR_NATIVE_INTERFACE!>a is I<!> && <!CANNOT_CHECK_FOR_NATIVE_INTERFACE!>b !is I<!>
@@ -2,7 +2,7 @@ package

 public fun box(/*0*/ a: kotlin.Any, /*1*/ b: kotlin.Any): kotlin.Boolean

-@kotlin.js.native public interface I {
+public interface I {
    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
@@ -4,9 +4,9 @@ inline fun <reified T> foo(x: T) {
    println(x)
 }

-@native interface I
+external interface I

-@native class C : I
+external class C : I

 operator inline fun <reified T> C.plus(other: T) = this

@@ -4,14 +4,14 @@ public fun bar(): kotlin.Unit
 public inline fun </*0*/ reified T> foo(/*0*/ x: T): kotlin.Unit
 public operator inline fun </*0*/ reified T> C.plus(/*0*/ other: T): C

-@kotlin.js.native public final class C : I {
+public final class C : I {
    public constructor C()
    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.native public interface I {
+public interface I {
    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
@@ -1,6 +1,6 @@
-@native interface I
+external interface I

-@native interface J
+external interface J

 fun box(a: Any) = when (a) {
    <!CANNOT_CHECK_FOR_NATIVE_INTERFACE!>is I<!> -> 0
@@ -2,13 +2,13 @@ package

 public fun box(/*0*/ a: kotlin.Any): kotlin.Int

-@kotlin.js.native public interface I {
+public interface I {
    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.native public interface J {
+public interface J {
    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
@@ -1,16 +1,12 @@
-@native
-fun foo(a: String): Int = noImpl
+external fun foo(a: String): Int = noImpl

-@native
-fun Int.foo(a: String): Int = noImpl
+external fun Int.foo(a: String): Int = noImpl

-@native
-class Bar(b: Int, c: Char) {
+external class Bar(b: Int, c: Char) {
    fun baz(d: Int) {}
 }

-@native
-object Obj {
+external object Obj {
    fun test1(e: String) {}
    object Nested {
        fun test2(g: Int) {}
@@ -1,9 +1,9 @@
 package

-@kotlin.js.native public fun foo(/*0*/ a: kotlin.String): kotlin.Int
-@kotlin.js.native public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int
+public external fun foo(/*0*/ a: kotlin.String): kotlin.Int
+public external fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int

-@kotlin.js.native public final class Bar {
+public final class Bar {
    public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
    public final fun baz(/*0*/ d: kotlin.Int): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -11,7 +11,7 @@ package
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

-@kotlin.js.native public object Obj {
+public object Obj {
    private constructor Obj()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -1,14 +1,13 @@
+// !DIAGNOSTICS: -DEPRECATION
@nativeGetter
 fun Int.foo(a: String): Int? = noImpl

-@native
-class Bar(b: Int, c: Char) {
+external class Bar(b: Int, c: Char) {
    @nativeGetter
    fun baz(d: Int): Any? = noImpl
 }

-@native
-object Obj {
+external object Obj {
    @nativeGetter
    fun test1(e: String): String? = noImpl

@@ -2,7 +2,7 @@ package

@kotlin.js.nativeGetter public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int?

-@kotlin.js.native public final class Bar {
+public final class Bar {
    public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
    @kotlin.js.nativeGetter public final fun baz(/*0*/ d: kotlin.Int): kotlin.Any?
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -10,7 +10,7 @@ package
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

-@kotlin.js.native public object Obj {
+public object Obj {
    private constructor Obj()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -1,14 +1,13 @@
+// !DIAGNOSTICS: -DEPRECATION
@nativeInvoke
 fun Int.foo(a: String): Int = noImpl

-@native
-class Bar(b: Int, c: Char) {
+external class Bar(b: Int, c: Char) {
    @nativeInvoke
    fun baz(d: Int) {}
 }

-@native
-object Obj {
+external object Obj {
    @nativeInvoke
    fun test1(e: String) {}

@@ -2,7 +2,7 @@ package

@kotlin.js.nativeInvoke public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int

-@kotlin.js.native public final class Bar {
+public final class Bar {
    public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
    @kotlin.js.nativeInvoke public final fun baz(/*0*/ d: kotlin.Int): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -10,7 +10,7 @@ package
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

-@kotlin.js.native public object Obj {
+public object Obj {
    private constructor Obj()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -1,14 +1,13 @@
+// !DIAGNOSTICS: -DEPRECATION
@nativeSetter
 fun Int.foo(a: String, v: Int): Int = noImpl

-@native
-class Bar(b: Int, c: Char) {
+external class Bar(b: Int, c: Char) {
    @nativeSetter
    fun baz(d: Int, v: Int) {}
 }

-@native
-object Obj {
+external object Obj {
    @nativeSetter
    fun test1(e: String, v: Any) {}

@@ -2,7 +2,7 @@ package

@kotlin.js.nativeSetter public fun kotlin.Int.foo(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Int

-@kotlin.js.native public final class Bar {
+public final class Bar {
    public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
    @kotlin.js.nativeSetter public final fun baz(/*0*/ d: kotlin.Int, /*1*/ v: kotlin.Int): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -10,7 +10,7 @@ package
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

-@kotlin.js.native public object Obj {
+public object Obj {
    private constructor Obj()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -329,12 +329,6 @@ public class DiagnosticsTestWithJsStdLibGenerated extends AbstractDiagnosticsTes
            doTest(fileName);
        }

-        @TestMetadata("nonTopLevelProhibited.kt")
-        public void testNonTopLevelProhibited() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/module/nonTopLevelProhibited.kt");
-            doTest(fileName);
-        }
-
        @TestMetadata("prohibitedOnNonNative.kt")
        public void testProhibitedOnNonNative() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/module/prohibitedOnNonNative.kt");
@@ -1,14 +1,12 @@
 package q

-@native
-class Foo {
+external class Foo {
    // RUN:
    fun foo(s: Array<String>) = noImpl
 }


 // RUN:
-@native
-fun main(s: Array<String>) {
+external fun main(s: Array<String>) {
    println("Top-level")
 }
@@ -222,7 +222,7 @@ class NameSuggestion {
                descriptor
            }

-            // If declaration is marked with either @native, @library or @JsName, return its stable name as is.
+            // If declaration is marked with either external, @native, @library or @JsName, return its stable name as is.
            val nativeName = getNameForAnnotatedObject(overriddenDescriptor)
            if (nativeName != null) return NameAndStability(nativeName, true)

@@ -50,9 +50,7 @@ private val DIAGNOSTIC_FACTORY_TO_RENDERER by lazy {
        put(ErrorsJs.JS_NAME_PROHIBITED_FOR_NAMED_NATIVE, "@JsName is prohibited for @native declaration with explicit name")
        put(ErrorsJs.JS_MODULE_PROHIBITED_ON_VAR, "@JsModule and @JsNonModule annotations prohibited for 'var' declarations. " +
                                                  "Use 'val' instead.")
-        put(ErrorsJs.JS_MODULE_PROHIBITED_ON_NON_NATIVE, "@JsModule and @JsNonModule annotations prohibited for non-@native declarations.")
-        put(ErrorsJs.JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL, "@JsModule and @JsNonModule annotations are only allowed to appear " +
-                                                           "on packages and top-level declarations")
+        put(ErrorsJs.JS_MODULE_PROHIBITED_ON_NON_NATIVE, "@JsModule and @JsNonModule annotations prohibited for non-external declarations.")
        put(ErrorsJs.NESTED_JS_MODULE_PROHIBITED, "@JsModule and @JsNonModule can't appear on here since the file is already " +
                                                  "marked by either @JsModule or @JsNonModule")
        put(ErrorsJs.CALL_TO_JS_MODULE_WITHOUT_MODULE_SYSTEM, "Can't access declaration marked with @JsModule annotation " +
@@ -54,7 +54,6 @@ public interface ErrorsJs {
    DiagnosticFactory0<PsiElement> JS_NAME_PROHIBITED_FOR_NAMED_NATIVE = DiagnosticFactory0.create(ERROR);
    DiagnosticFactory0<KtElement> JS_MODULE_PROHIBITED_ON_VAR = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE_OR_DEFAULT);
    DiagnosticFactory0<KtElement> JS_MODULE_PROHIBITED_ON_NON_NATIVE = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE_OR_DEFAULT);
-    DiagnosticFactory0<KtElement> JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE_OR_DEFAULT);
    DiagnosticFactory0<KtElement> NESTED_JS_MODULE_PROHIBITED = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE_OR_DEFAULT);
    DiagnosticFactory0<PsiElement> CALL_TO_JS_MODULE_WITHOUT_MODULE_SYSTEM = DiagnosticFactory0.create(ERROR, DEFAULT);
    DiagnosticFactory0<PsiElement> CALL_TO_JS_NON_MODULE_WITH_MODULE_SYSTEM = DiagnosticFactory0.create(ERROR, DEFAULT);
@@ -42,10 +42,6 @@ object JsModuleChecker : SimpleDeclarationChecker {
            diagnosticHolder.report(ErrorsJs.JS_MODULE_PROHIBITED_ON_NON_NATIVE.on(declaration))
        }

-        if (!DescriptorUtils.isTopLevelDeclaration(descriptor)) {
-            diagnosticHolder.report(ErrorsJs.JS_MODULE_PROHIBITED_ON_NON_TOPLEVEL.on(declaration))
-        }
-
        val isFileModuleOrNonModule = AnnotationsUtils.getFileModuleName(bindingContext, descriptor) != null ||
                                      AnnotationsUtils.isFromNonModuleFile(bindingContext, descriptor)
        if (isFileModuleOrNonModule) {
@@ -16,6 +16,5 @@

 package kotlin.js.internal

-@native
@JsName("Error")
-public open class JsError(message: String?)
+public external open class JsError(message: String?)
@@ -20,8 +20,8 @@ import kotlin.annotation.AnnotationTarget.*

@Retention(AnnotationRetention.BINARY)
@Target(CLASS, FUNCTION, PROPERTY, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER)
-@native internal annotation class JsName(val name: String)
+internal external annotation class JsName(val name: String)

-@native internal annotation class native
+internal external annotation class native

-@native internal fun js(code: String): dynamic
+internal external fun js(code: String): dynamic
@@ -18,37 +18,30 @@ package kotlin.js

 import kotlin.annotation.AnnotationTarget.*

-@native
@Target(CLASS, FUNCTION, PROPERTY, CONSTRUCTOR, VALUE_PARAMETER, PROPERTY_GETTER, PROPERTY_SETTER)
@Deprecated("Use `external` modifier instead")
-public annotation class native(@Deprecated public val name: String = "")
+public external annotation class native(@Deprecated public val name: String = "")

-@native
@Target(FUNCTION)
-@Deprecated
-public annotation class nativeGetter
+@Deprecated("Use inline extension function with body using dynamic")
+public external annotation class nativeGetter

-@native
@Target(FUNCTION)
-@Deprecated
-public annotation class nativeSetter
+@Deprecated("Use inline extension function with body using dynamic")
+public external annotation class nativeSetter

-@native
@Target(FUNCTION)
-@Deprecated
-public annotation class nativeInvoke
+@Deprecated("Use inline extension function with body using dynamic")
+public external annotation class nativeInvoke

-@native
@Target(CLASS, FUNCTION, PROPERTY)
-internal annotation class library(public val name: String = "")
+internal external annotation class library(public val name: String = "")

-@native
@Target(PROPERTY)
-public annotation class enumerable()
+public external annotation class enumerable()

-@native
@Target(CLASS)
-internal annotation class marker
+internal external annotation class marker

@Retention(AnnotationRetention.BINARY)
@Target(CLASS, FUNCTION, PROPERTY, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER)
@@ -19,9 +19,9 @@ package kotlin.text
 // actually \s is enough to match all whitespace, but \xA0 added because of different regexp behavior of Rhino used in Selenium tests
 public fun Char.isWhitespace(): Boolean = toString().matches("[\\s\\xA0]")

-@native public fun Char.toLowerCase(): Char = noImpl
+public external fun Char.toLowerCase(): Char = noImpl

-@native public fun Char.toUpperCase(): Char = noImpl
+public external fun Char.toUpperCase(): Char = noImpl

 /**
 * Returns `true` if this character is a Unicode high-surrogate code unit (also known as leading-surrogate code unit).
@@ -19,7 +19,7 @@ package kotlin

 // Note:
 // Right now we don't want to have neither 'volatile' nor 'synchronized' at runtime,
-// so they annotated as 'native' to avoid warnings/errors from some minifiers.
+// so they annotated as `external` to avoid warnings/errors from some minifiers.
 // They was reserved word in ECMAScript 2, but is not since ECMAScript 5.

 // Additional note:
@@ -29,10 +29,10 @@ package kotlin

@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
@Retention(AnnotationRetention.SOURCE)
-public annotation class Volatile
+public external annotation class Volatile

@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
@Retention(AnnotationRetention.SOURCE)
-public annotation class Synchronized
+public external annotation class Synchronized

-public inline fun <R> synchronized(lock: Any, crossinline block: () -> R): R = block()
+public external inline fun <R> synchronized(lock: Any, crossinline block: () -> R): R = block()
@@ -1,16 +1,13 @@
 package kotlin.js

-@native
-public val noImpl: Nothing
+public external val noImpl: Nothing
    get() = throw Exception()

-@native
-public fun eval(expr: String): dynamic = noImpl
+public external fun eval(expr: String): dynamic = noImpl

-@native
-public val undefined: Nothing? = noImpl
+public external val undefined: Nothing? = noImpl

-@native operator fun <K, V> MutableMap<K, V>.set(key: K, value: V): V? = noImpl
+external operator fun <K, V> MutableMap<K, V>.set(key: K, value: V): V? = noImpl

@library
 public fun println() {}
@@ -22,8 +19,7 @@ public fun println(s: Any?) {}
 public fun print(s: Any?) {}

 //TODO: consistent parseInt
-@native
-public fun parseInt(s: String, radix: Int = 10): Int = noImpl
+public external fun parseInt(s: String, radix: Int = 10): Int = noImpl

@library
 public fun safeParseInt(s: String): Int? = noImpl
@@ -31,8 +27,7 @@ public fun safeParseInt(s: String): Int? = noImpl
@library
 public fun safeParseDouble(s: String): Double? = noImpl

-@native
-public fun js(code: String): dynamic = noImpl
+public external fun js(code: String): dynamic = noImpl

 /**
 * Function corresponding to JavaScript's `typeof` operator
@@ -1,6 +1,5 @@
 package kotlin.js

-@native
-public class Date() {
+public external class Date() {
    public fun getTime(): Int = noImpl
 }
@@ -1,13 +1,12 @@
 package kotlin.js

 // https://developer.mozilla.org/en/DOM/console
-@native public interface Console {
-    @native public fun dir(o: Any): Unit = noImpl
-    @native public fun error(vararg o: Any?): Unit = noImpl
-    @native public fun info(vararg o: Any?): Unit = noImpl
-    @native public fun log(vararg o: Any?): Unit = noImpl
-    @native public fun warn(vararg o: Any?): Unit = noImpl
+external public interface Console {
+    public fun dir(o: Any): Unit = noImpl
+    public fun error(vararg o: Any?): Unit = noImpl
+    public fun info(vararg o: Any?): Unit = noImpl
+    public fun log(vararg o: Any?): Unit = noImpl
+    public fun warn(vararg o: Any?): Unit = noImpl
 }

-@native
-public val console: Console = noImpl
+public external val console: Console = noImpl
@@ -21,8 +21,7 @@ package java.util
 // typealias Date = kotlin.js.Date

@Deprecated("Use kotlin.js.Date instead", ReplaceWith("kotlin.js.Date"))
-@native
-public class Date() {
+public external class Date() {
    public fun getTime(): Int = noImpl
 }

@@ -1,6 +1,6 @@
 package kotlin.js

-@native public class Json() {
+public external class Json() {
    operator fun get(propertyName: String): Any? = noImpl
    operator fun set(propertyName: String, value: Any?): Unit = noImpl
 }
@@ -16,8 +16,7 @@ public fun json(vararg pairs: Pair<String, Any?>): Json {
@library("jsonAddProperties")
 public fun Json.add(other: Json): Json = noImpl

-@native
-public interface JsonClass {
+public external interface JsonClass {
    public fun stringify(o: Any): String
    public fun stringify(o: Any, replacer: (key: String, value: Any?) -> Any?): String
    public fun stringify(o: Any, replacer: (key: String, value: Any?) -> Any?, space: Int): String
@@ -30,5 +29,4 @@ public interface JsonClass {
    public fun <T> parse(text: String, reviver: ((key: String, value: Any?) -> Any?)): T
 }

-@native
-public val JSON: JsonClass = noImpl
+public external val JSON: JsonClass = noImpl
@@ -1,8 +1,7 @@
 package kotlin.js

 //TODO: declare using number
-@native
-public class MathClass() {
+public external class MathClass() {
    public val PI: Double = noImpl
    public fun random(): Double = noImpl
    public fun abs(value: Double): Double = noImpl
@@ -26,5 +25,4 @@ public class MathClass() {
    public fun ceil(value: Number): Int = noImpl
 }

-@native
-public val Math: MathClass = MathClass()
+public external val Math: MathClass = MathClass()
@@ -17,7 +17,7 @@
 package kotlin.text.js


-@native public class RegExp(pattern: String, flags: String? = null) {
+public external class RegExp(pattern: String, flags: String? = null) {

    public fun test(str: String): Boolean = noImpl

@@ -40,7 +40,7 @@ public fun RegExp.reset() {
 }

 // TODO: Inherit from array or introduce asArray() extension
-@native public interface RegExpMatch {
+public external interface RegExpMatch {
    public val index: Int
    public val input: String
    public val length: Int
@@ -2,21 +2,21 @@ package kotlin.text

 import kotlin.text.js.RegExp

-@native public fun String.toUpperCase(): String = noImpl
+public external fun String.toUpperCase(): String = noImpl

-@native public fun String.toLowerCase(): String = noImpl
+public external fun String.toLowerCase(): String = noImpl

-@native("indexOf")
-internal fun String.nativeIndexOf(str: String, fromIndex: Int): Int = noImpl
+@JsName("indexOf")
+internal external fun String.nativeIndexOf(str: String, fromIndex: Int): Int = noImpl

-@native("lastIndexOf")
-internal fun String.nativeLastIndexOf(str: String, fromIndex: Int): Int = noImpl
+@JsName("lastIndexOf")
+internal external fun String.nativeLastIndexOf(str: String, fromIndex: Int): Int = noImpl

-@native("startsWith")
-internal fun String.nativeStartsWith(s: String, position: Int): Boolean = noImpl
+@JsName("startsWith")
+internal external fun String.nativeStartsWith(s: String, position: Int): Boolean = noImpl

-@native("endsWith")
-internal fun String.nativeEndsWith(s: String): Boolean = noImpl
+@JsName("endsWith")
+internal external fun String.nativeEndsWith(s: String): Boolean = noImpl

@Deprecated("Use split(Regex) instead.", ReplaceWith("split(regex.toRegex()).toTypedArray()"))
@library("splitString")
@@ -26,19 +26,18 @@ public fun String.splitWithRegex(regex: String): Array<String> = noImpl
@library("splitString")
 public fun String.splitWithRegex(regex: String, limit: Int): Array<String> = noImpl

-@native public fun String.substring(startIndex: Int): String = noImpl
+public external fun String.substring(startIndex: Int): String = noImpl

-@native public fun String.substring(startIndex: Int, endIndex: Int): String = noImpl
+public external fun String.substring(startIndex: Int, endIndex: Int): String = noImpl

-@native public fun String.concat(str: String): String = noImpl
+public external fun String.concat(str: String): String = noImpl

-@native public fun String.match(regex: String): Array<String> = noImpl
+public external fun String.match(regex: String): Array<String> = noImpl

 //native public fun String.trim() : String = noImpl
 //TODO: String.replace to implement effective trimLeading and trimTrailing

-@native("length")
-public val CharSequence.size: Int get() = noImpl
+public inline val CharSequence.size: Int get() = asDynamic().length

-@native("replace")
-internal fun String.nativeReplace(pattern: RegExp, replacement: String): String = noImpl
+@JsName("replace")
+internal external fun String.nativeReplace(pattern: RegExp, replacement: String): String = noImpl
@@ -2,8 +2,7 @@ package jquery

 import org.w3c.dom.Element

-@native
-public class JQuery() {
+public external class JQuery() {
    public fun addClass(className: String): JQuery = noImpl;
    public fun addClass(f: Element.(Int, String) -> String): JQuery = noImpl;

@@ -43,8 +42,7 @@ public class JQuery() {
    public fun `val`(): String? = noImpl
 }

-@native
-open public class MouseEvent() {
+open public external class MouseEvent() {
    public val pageX: Double = 0.0;
    public val pageY: Double = 0.0;
    public fun preventDefault() {
@@ -52,20 +50,19 @@ open public class MouseEvent() {
    public fun isDefaultPrevented(): Boolean = true;
 }

-@native
-public class MouseClickEvent() : MouseEvent() {
+public external class MouseClickEvent() : MouseEvent() {
    public val which: Int = 0;
 }

-@native("$")
-public fun jq(selector: String): JQuery = JQuery();
-@native("$")
-public fun jq(selector: String, context: Element): JQuery = JQuery();
-@native("$")
-public fun jq(callback: () -> Unit): JQuery = JQuery();
-@native("$")
-public fun jq(obj: JQuery): JQuery = JQuery();
-@native("$")
-public fun jq(el: Element): JQuery = JQuery();
-@native("$")
-public fun jq(): JQuery = JQuery();
+@JsName("$")
+public external fun jq(selector: String): JQuery = JQuery();
+@JsName("$")
+public external fun jq(selector: String, context: Element): JQuery = JQuery();
+@JsName("$")
+public external fun jq(callback: () -> Unit): JQuery = JQuery();
+@JsName("$")
+public external fun jq(obj: JQuery): JQuery = JQuery();
+@JsName("$")
+public external fun jq(el: Element): JQuery = JQuery();
+@JsName("$")
+public external fun jq(): JQuery = JQuery();
@@ -4,23 +4,22 @@ package jquery.ui
 //jquery UI
 import jquery.JQuery

-@native
-public fun JQuery.buttonset()  : JQuery = noImpl;
-@native
-public fun JQuery.dialog() : JQuery = noImpl;
-@native
-public fun JQuery.dialog(params : Json) : JQuery = noImpl
-@native
-public fun JQuery.dialog(mode : String, param : String) : Any? = noImpl
-@native
-public fun JQuery.dialog(mode : String) : JQuery = noImpl
-@native
-public fun JQuery.dialog(mode : String, param : String, value : Any?) : JQuery = noImpl
-@native
-public fun JQuery.button() : JQuery = noImpl;
-@native
-public fun JQuery.accordion() : JQuery = noImpl
-@native
-public fun JQuery.draggable(params : Json) : JQuery = noImpl
-@native
-public fun JQuery.selectable() : JQuery = noImpl
+public external fun JQuery.buttonset()  : JQuery = noImpl;
+
+public external fun JQuery.dialog() : JQuery = noImpl;
+
+public external fun JQuery.dialog(params : Json) : JQuery = noImpl
+
+public external fun JQuery.dialog(mode : String, param : String) : Any? = noImpl
+
+public external fun JQuery.dialog(mode : String) : JQuery = noImpl
+
+public external fun JQuery.dialog(mode : String, param : String, value : Any?) : JQuery = noImpl
+
+public external fun JQuery.button() : JQuery = noImpl;
+
+public external fun JQuery.accordion() : JQuery = noImpl
+
+public external fun JQuery.draggable(params : Json) : JQuery = noImpl
+
+public external fun JQuery.selectable() : JQuery = noImpl
@@ -1,4 +1,3 @@
 package org.junit

-@native
-public annotation class Test(val name: String = "")
+public external annotation class Test(val name: String = "")
--- a/Show More
+++ b/Show More