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

js/js.translator/testData/box/closure/closureThisByUsingMethodFromParentClass.kt

@@ -2,15 +2,14 @@ package foo
 
 // HACKS
 
-@native
-const val PATH_TO_F_CREATOR = "B\$far\$lambda"
-@native
-const val PATH_TO_G_CREATOR = "B\$gar\$lambda"
+external const val PATH_TO_F_CREATOR = "B\$far\$lambda"
+external const val PATH_TO_G_CREATOR = "B\$gar\$lambda"
 
-@native("$PATH_TO_F_CREATOR")
-val F_CREATOR: Any = noImpl
-@native("$PATH_TO_G_CREATOR")
-val G_CREATOR: Any = noImpl
+@JsName("$PATH_TO_F_CREATOR")
+external val F_CREATOR: Any = noImpl
+
+@JsName("$PATH_TO_G_CREATOR")
+external val G_CREATOR: Any = noImpl
 
 
 // Test
@@ -46,10 +45,8 @@ fun box(): String {
 
 // Helpers
 
-@native
-fun String.replace(regexp: RegExp, replacement: String): String = noImpl
+external fun String.replace(regexp: RegExp, replacement: String): String = noImpl
 
 fun String.replaceAll(regexp: String, replacement: String): String = replace(RegExp(regexp, "g"), replacement)
 
-@native
-class RegExp(regexp: String, flags: String)
+external class RegExp(regexp: String, flags: String)

js/js.translator/testData/box/crossModuleRef/constructor.kt

@@ -6,7 +6,7 @@ class A(val x: Int) {
     constructor(a: Int, b: Int) : this(a + b)
 }
 
-@native class B(x: Int) {
+external class B(x: Int) {
     constructor(a: Int, b: Int) : this(0) {}
 
     val x: Int

js/js.translator/testData/box/crossModuleRef/topLevelFunction.kt

@@ -5,7 +5,7 @@ package lib
 
 fun foo() = 23
 
-@native fun bar(): Int = noImpl
+external fun bar(): Int = noImpl
 
 inline fun baz() = 99
 

js/js.translator/testData/box/crossModuleRef/topLevelProperty.kt

@@ -7,9 +7,9 @@ val foo = 23
 val boo: Int
     get() = 42
 
-@native val bar: Int = noImpl
+external val bar: Int = noImpl
 
-@native val far: Int
+external val far: Int
     get() = noImpl
 
 // TODO: annotations like this are not serialized properly. Uncomment after KT-14529 gets fixed
@@ -20,7 +20,8 @@ val fuzz: Int
 
 inline fun fetchFoo() = foo
 
-@JsName("fee") val tee = 2525
+@JsName("fee")
+val tee = 2525
 
 // FILE: lib.js
 

js/js.translator/testData/box/dynamic/_common.kt

@@ -1,13 +1,10 @@
 package foo
 
-@native
-var bar: dynamic = noImpl
+external var bar: dynamic = noImpl
 
-@native
-var arr: dynamic = noImpl
+external var arr: dynamic = noImpl
 
-@native
-var baz: dynamic = noImpl
+external var baz: dynamic = noImpl
 
 object t {
     override fun toString() = "object t {}"

js/js.translator/testData/box/dynamic/is.kt

@@ -3,8 +3,7 @@ package foo
 
 class A
 
-@native
-class B
+external class B
 
 fun box(): String {
     val a: dynamic = A()

js/js.translator/testData/box/enum/nativeEnum.kt

@@ -1,7 +1,6 @@
 package foo
 
-@native
-enum class JsEnum {
+external enum class JsEnum {
     Foo,
     Bar,
     Baz

js/js.translator/testData/box/expression/function/_common.kt

@@ -1,14 +1,11 @@
 package foo
 
-@native
-fun String.replace(regexp: RegExp, replacement: String): String = noImpl
+external fun String.replace(regexp: RegExp, replacement: String): String = noImpl
 
 fun String.replaceAll(regexp: String, replacement: String): String = replace(RegExp(regexp, "g"), replacement)
 
-@native
-fun String.search(regexp: RegExp): Int = noImpl
+external fun String.search(regexp: RegExp): Int = noImpl
 
-@native
-class RegExp(regexp: String, flags: String = "") {
+external class RegExp(regexp: String, flags: String = "") {
     fun exec(s: String): Array<String>? = noImpl
 }

js/js.translator/testData/box/expression/function/mangling.kt

@@ -5,35 +5,35 @@ private var log = ""
 public fun public_baz(i: Int) {
     log = "public_baz"
 }
-@native public fun public_baz(a: String) {
+external public fun public_baz(a: String) {
 }
 
 internal fun internal_baz(i: Int) {
 }
-internal @native fun internal_baz(a: String) {
+internal external fun internal_baz(a: String) {
 }
 
 private fun getCurrentPackage(): dynamic = js("_").foo
 
 private fun private_baz(i: Int) {
 }
-@native private fun private_baz(a: String) {
+private external fun private_baz(a: String) {
 }
 
 public class PublicClass {
     public fun public_baz(i: Int) {
     }
-    @native public fun public_baz(a: String) {
+    public external fun public_baz(a: String) {
     }
 
     internal fun internal_baz(i: Int) {
     }
-    @native internal fun internal_baz(a: String) {
+    internal external fun internal_baz(a: String) {
     }
 
     private fun private_baz(i: Int) {
     }
-    @native private fun private_baz(a: String) {
+    private external fun private_baz(a: String) {
     }
 
     val call_private_baz = { private_baz(0) }
@@ -43,17 +43,17 @@ public class PublicClass {
 internal class InternalClass {
     public fun public_baz(i: Int) {
     }
-    @native public fun public_baz(a: String) {
+    public external fun public_baz(a: String) {
     }
 
     internal fun internal_baz(i: Int) {
     }
-    @native internal fun internal_baz(a: String) {
+    internal external fun internal_baz(a: String) {
     }
 
     private fun private_baz(i: Int) {
     }
-    @native private fun private_baz(a: String) {
+    private external fun private_baz(a: String) {
     }
 
     val call_private_baz = { private_baz(0) }
@@ -63,17 +63,17 @@ internal class InternalClass {
 private class PrivateClass {
     public fun public_baz(i: Int) {
     }
-    @native public fun public_baz(a: String) {
+    public external fun public_baz(a: String) {
     }
 
     internal fun internal_baz(i: Int) {
     }
-    @native internal fun internal_baz(a: String) {
+    internal external fun internal_baz(a: String) {
     }
 
     private fun private_baz(i: Int) {
     }
-    @native private fun private_baz(a: String) {
+    private external fun private_baz(a: String) {
     }
 
     val call_private_baz = { private_baz(0) }
@@ -83,17 +83,17 @@ private class PrivateClass {
 open public class OpenPublicClass {
     public fun public_baz(i: Int) {
     }
-    @native public fun public_baz(a: String) {
+    public external fun public_baz(a: String) {
     }
 
     internal fun internal_baz(i: Int) {
     }
-    @native internal fun internal_baz(a: String) {
+    internal external fun internal_baz(a: String) {
     }
 
     private fun private_baz(i: Int) {
     }
-    @native private fun private_baz(a: String) {
+    private external fun private_baz(a: String) {
     }
 
     val call_private_baz = { private_baz(0) }
@@ -103,17 +103,17 @@ open public class OpenPublicClass {
 internal open class OpenInternalClass {
     public fun public_baz(i: Int) {
     }
-    @native public fun public_baz(a: String) {
+    public external fun public_baz(a: String) {
     }
 
     internal fun internal_baz(i: Int) {
     }
-    @native internal fun internal_baz(a: String) {
+    internal external fun internal_baz(a: String) {
     }
 
     private fun private_baz(i: Int) {
     }
-    @native private fun private_baz(a: String) {
+    private external fun private_baz(a: String) {
     }
 
     val call_private_baz = { private_baz(0) }
@@ -123,17 +123,17 @@ internal open class OpenInternalClass {
 open private class OpenPrivateClass {
     public fun public_baz(i: Int) {
     }
-    @native public fun public_baz(a: String) {
+    public external fun public_baz(a: String) {
     }
 
     internal fun internal_baz(i: Int) {
     }
-    @native internal fun internal_baz(a: String) {
+    internal external fun internal_baz(a: String) {
     }
 
     private fun private_baz(i: Int) {
     }
-    @native private fun private_baz(a: String) {
+    private external fun private_baz(a: String) {
     }
 
     val call_private_baz = { private_baz(0) }

js/js.translator/testData/box/expression/misc/elvisWithThrow.kt

@@ -6,9 +6,6 @@ fun bar(): Any? {
     return null
 }
 
-@native
-val Exception.message: String get() = noImpl
-
 fun box(): String {
     val a: String? = null
     try {

js/js.translator/testData/box/expression/when/whenEqualsPattern.kt

@@ -2,7 +2,7 @@ package foo
 
 data class A(val bar: Int)
 
-@native class B
+external class B
 
 fun makeB(): B = js("new Object();")
 

js/js.translator/testData/box/inheritance/fromNativeInterface.kt

@@ -1,7 +1,6 @@
 package foo
 
-@native
-interface A {
+external interface A {
     val bar: Int get() = noImpl
     fun foo(): String = noImpl
 }

js/js.translator/testData/box/inheritance/fromNestedNativeClass.kt

@@ -2,8 +2,7 @@
 
 package foo
 
-@native
-class A {
+external class A {
     open class B {
         fun foo(): String
     }

js/js.translator/testData/box/inheritance/nativeNativeKotlin.kt

@@ -2,13 +2,11 @@
 
 package foo
 
-@native
-open class A {
+external open class A {
     fun foo(): String
 }
 
-@native
-open class B : A() {
+external open class B : A() {
     fun bar(): String
 }
 

js/js.translator/testData/box/inheritance/overrideAnyMethods.kt

@@ -1,7 +1,6 @@
 package foo
 
-@native
-fun String.charCodeAt(i: Int): Int = noImpl
+external fun String.charCodeAt(i: Int): Int = noImpl
 
 // Because String in JS doesn't have hashCode method
 fun String.myHashCode(): Int {

js/js.translator/testData/box/inline/arrayLiteralAliasing.kt

@@ -28,9 +28,9 @@ package foo
 
 // CHECK_NOT_CALLED: moveTo
 
-@native fun Array<Int>.push(element: Int): Unit = noImpl
+external fun Array<Int>.push(element: Int): Unit = noImpl
 
-@native fun Array<Int>.splice(index: Int, howMany: Int): Unit = noImpl
+external fun Array<Int>.splice(index: Int, howMany: Int): Unit = noImpl
 
 data class PairArray<T, R>(val fst: Array<T>, val snd: Array<R>)
 

js/js.translator/testData/box/inlineMultiFile/_common.kt

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

js/js.translator/testData/box/inlineMultiFile/tryCatch2.kt

@@ -136,7 +136,7 @@ inline fun <T, R> T.performWithFail2(job: (T)-> R, failJob: (e: RuntimeException
     }
 }
 
-@native object Number {
+external object Number {
     fun parseInt(str: String): Int = noImpl
 }
 

js/js.translator/testData/box/jsCode/literal.kt

@@ -1,6 +1,6 @@
 package foo
 
-@native interface HasName {
+external interface HasName {
     val name: String
 }
 

js/js.translator/testData/box/jsCode/object.kt

@@ -1,6 +1,6 @@
 package foo
 
-@native interface Summizer {
+external interface Summizer {
     fun sum(a: Int, b: Int): Int
 }
 

js/js.translator/testData/box/jsCode/objectScopes.kt

@@ -1,6 +1,6 @@
 package foo
 
-@native interface Summizer {
+external interface Summizer {
     fun sum(a: Int, b: Int): Int
 }
 

js/js.translator/testData/box/jsModule/externalClass.kt

@@ -2,8 +2,8 @@
 package foo
 
 @JsModule("lib")
-@native class A(@native val x: Int = noImpl) {
-    @native fun foo(y: Int): Int = noImpl
+external class A(val x: Int = noImpl) {
+    fun foo(y: Int): Int = noImpl
 }
 
 fun box(): String {

js/js.translator/testData/box/jsModule/externalFunction.kt

@@ -2,7 +2,7 @@
 package foo
 
 @JsModule("lib")
-@native fun foo(y: Int): Int = noImpl
+external fun foo(y: Int): Int = noImpl
 
 fun box(): String {
     assertEquals(65, foo(42))

js/js.translator/testData/box/jsModule/externalFunctionPlain.kt

@@ -2,7 +2,7 @@ package foo
 
 @JsModule("lib")
 @JsNonModule
-@native fun foo(y: Int): Int = noImpl
+external fun foo(y: Int): Int = noImpl
 
 fun box(): String {
     assertEquals(65, foo(42))

js/js.translator/testData/box/jsModule/externalFunctionUmd.kt

@@ -3,7 +3,7 @@ package foo
 
 @JsModule("lib-foo")
 @JsNonModule
-@native fun foo(x: Int): Int = noImpl
+external fun foo(x: Int): Int = noImpl
 
 fun box(): String {
     assertEquals(65, foo(42))

js/js.translator/testData/box/jsModule/externalFunctionUmdFallback.kt

@@ -4,12 +4,12 @@ package foo
 
 @JsModule("libfoo")
 @JsNonModule
-@native fun foo(x: Int): Int = noImpl
+external fun foo(x: Int): Int = noImpl
 
 @JsModule("libbar") 
 @JsNonModule
 @JsName("baz")
-@native fun bar(x: Int): Int = noImpl
+external fun bar(x: Int): Int = noImpl
 
 fun box(): String {
     assertEquals(65, foo(42))

js/js.translator/testData/box/jsModule/externalObject.kt

@@ -2,10 +2,10 @@
 package foo
 
 @JsModule("lib")
-@native object A {
-    @native val x: Int = noImpl
+external object A {
+    val x: Int = noImpl
 
-    @native fun foo(y: Int): Int = noImpl
+    fun foo(y: Int): Int = noImpl
 }
 
 fun box(): String {

js/js.translator/testData/box/jsModule/externalPackage.kt

@@ -2,21 +2,21 @@
 @file:JsModule("lib")
 package foo
 
-@native class A(@native val x: Int = noImpl) {
-    @native fun foo(y: Int): Int = noImpl
+external class A(@native val x: Int = noImpl) {
+    fun foo(y: Int): Int = noImpl
 }
 
-@native object B {
-    @native val x: Int = noImpl
+external object B {
+    val x: Int = noImpl
 
-    @native fun foo(y: Int): Int = noImpl
+    fun foo(y: Int): Int = noImpl
 }
 
-@native fun foo(y: Int): Int = noImpl
+external fun foo(y: Int): Int = noImpl
 
-@native val bar: Int = noImpl
+external val bar: Int = noImpl
 
-@native var mbar: Int = noImpl
+external var mbar: Int = noImpl
 
 fun box(): String {
     val a = A(23)

js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.kt

@@ -3,26 +3,26 @@
 @file:JsModule("lib")
 package foo
 
-@native class A(@native val x: Int = noImpl) {
-    @native fun foo(y: Int): Int = noImpl
+external class A(@native val x: Int = noImpl) {
+    fun foo(y: Int): Int = noImpl
 }
 
-@native object B {
-    @native val x: Int = noImpl
+external object B {
+    val x: Int = noImpl
 
-    @native fun foo(y: Int): Int = noImpl
+    fun foo(y: Int): Int = noImpl
 }
 
-@native fun foo(y: Int): Int = noImpl
+external fun foo(y: Int): Int = noImpl
 
-@native val bar: Int = noImpl
+external val bar: Int = noImpl
 
-@native var mbar: Int = noImpl
+external var mbar: Int = noImpl
 
 // FILE: lib2.kt
 package foo
 
-@native object C {
+external object C {
     fun f(): Int = noImpl
 }
 

js/js.translator/testData/box/jsModule/externalPackagePlain.kt

@@ -2,21 +2,21 @@
 @file:JsNonModule
 package foo
 
-@native class A(@native val x: Int = noImpl) {
-    @native fun foo(y: Int): Int = noImpl
+external class A(val x: Int = noImpl) {
+    fun foo(y: Int): Int = noImpl
 }
 
-@native object B {
-    @native val x: Int = noImpl
+external object B {
+    val x: Int = noImpl
 
-    @native fun foo(y: Int): Int = noImpl
+    fun foo(y: Int): Int = noImpl
 }
 
-@native fun foo(y: Int): Int = noImpl
+external fun foo(y: Int): Int = noImpl
 
-@native val bar: Int = noImpl
+external val bar: Int = noImpl
 
-@native var mbar: Int = noImpl
+external var mbar: Int = noImpl
 
 fun box(): String {
     val a = A(23)

js/js.translator/testData/box/jsModule/externalPackageUmdFallback.kt

@@ -4,21 +4,21 @@
 @file:JsNonModule
 package foo
 
-@native class A(@native val x: Int = noImpl) {
-    @native fun foo(y: Int): Int = noImpl
+external class A(val x: Int = noImpl) {
+    fun foo(y: Int): Int = noImpl
 }
 
-@native object B {
-    @native val x: Int = noImpl
+external object B {
+    val x: Int = noImpl
 
-    @native fun foo(y: Int): Int = noImpl
+    fun foo(y: Int): Int = noImpl
 }
 
-@native fun foo(y: Int): Int = noImpl
+external fun foo(y: Int): Int = noImpl
 
-@native val bar: Int = noImpl
+external val bar: Int = noImpl
 
-@native var mbar: Int = noImpl
+external var mbar: Int = noImpl
 
 fun box(): String {
     val a = A(23)

js/js.translator/testData/box/jsModule/externalProperty.kt

@@ -2,7 +2,7 @@
 package foo
 
 @JsModule("lib")
-@native val foo: Int = noImpl
+external val foo: Int = noImpl
 
 fun box(): String {
     assertEquals(23, foo)

js/js.translator/testData/box/jsName/inheritFromRenamedNativeClass.kt

@@ -2,9 +2,8 @@
 
 package foo
 
-@native
 @JsName("A")
-open class B(val foo: String)
+external open class B(val foo: String)
 
 class C(s: String) : B(s)
 

js/js.translator/testData/box/jsName/inheritFromRenamedNativeClassMultimodule.kt

@@ -3,9 +3,8 @@
 
 package foo
 
-@native
 @JsName("A")
-open class B(val foo: String)
+external open class B(val foo: String)
 
 // MODULE: main(module1)
 // FILE: main.kt

js/js.translator/testData/box/jsName/jsName.kt

@@ -1,22 +1,30 @@
 package foo
 
-@JsName("bar") @native fun foo(): Int = noImpl
+@JsName("bar")
+external fun foo(): Int = noImpl
 
-@JsName("baz") @native val prop: Int get() = noImpl
+@JsName("baz")
+external val prop: Int get() = noImpl
 
-@JsName("B") @native class A {
-    @JsName("g") fun f(): Int = noImpl
+@JsName("B")
+external class A {
+    @JsName("g")
+    fun f(): Int = noImpl
 
-    @JsName("q") val p: Int get() = noImpl
+    @JsName("q")
+    val p: Int get() = noImpl
 
     companion object {
-        @JsName("g") fun f(): Int = noImpl
+        @JsName("g")
+        fun f(): Int = noImpl
 
-        @JsName("q") val p: Int get() = noImpl
+        @JsName("q")
+        val p: Int get() = noImpl
     }
 }
 
-@JsName("P") @native object O {
+@JsName("P")
+external object O {
     fun f(): Int = noImpl
 }
 

js/js.translator/testData/box/jsName/jsNamePropertyAccessors.kt

@@ -1,6 +1,6 @@
 package foo
 
-@native class A {
+external class A {
     val xx: Int
         @JsName("getX") get
 
@@ -9,7 +9,7 @@ package foo
         @JsName("setY") set
 }
 
-@native var zz: Int
+external var zz: Int
     @JsName("getZ") get
     @JsName("setZ") set
 

js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt

@@ -4,21 +4,21 @@
 @file:JsModule("native-lib")
 package foo
 
-@native class A(@native val x: Int = noImpl) {
-    @native fun foo(y: Int): Int = noImpl
+external class A(val x: Int = noImpl) {
+    fun foo(y: Int): Int = noImpl
 }
 
-@native object B {
-    @native val x: Int = noImpl
+external object B {
+    val x: Int = noImpl
 
-    @native fun foo(y: Int): Int = noImpl
+    fun foo(y: Int): Int = noImpl
 }
 
-@native fun foo(y: Int): Int = noImpl
+external fun foo(y: Int): Int = noImpl
 
-@native val bar: Int = noImpl
+external val bar: Int = noImpl
 
-@native var mbar: Int = noImpl
+external var mbar: Int = noImpl
 
 // MODULE: main(lib)
 // FILE: main.kt

js/js.translator/testData/box/nameClashes/propertyAndNativeMethod.kt

@@ -2,7 +2,7 @@
 // FILE: lib.kt
 package lib
 
-@native fun bar()
+external fun bar()
 
 val bar = 32
 

js/js.translator/testData/box/native/class.kt

@@ -1,7 +1,6 @@
 package foo
 
-@native
-class A(b: Int) {
+external class A(b: Int) {
     fun g(): Int = noImpl
     fun m(): Int = noImpl
 }

js/js.translator/testData/box/native/classObject.kt

@@ -1,9 +1,7 @@
 package foo
 
-@native
-class A(val c: Int) {
-    @native
-    companion object {
+external class A(val c: Int) {
+    external companion object {
         val g: Int = noImpl
         val c: String = noImpl
     }

js/js.translator/testData/box/native/inheritanceFromNativeClass.kt

@@ -1,13 +1,12 @@
 package foo
 
-@native
-internal open class A(val a: Int) {
+internal external open class A(val a: Int) {
     fun g(): Int = noImpl
     fun m(): Int = noImpl
 
     public open fun foo(i: Int): String = noImpl
     public fun boo(i: Int): String = noImpl
-    @native("bar")
+    @JsName("bar")
     open fun baz(i: Int): String = noImpl
 }
 

js/js.translator/testData/box/native/inheritanceFromNativeTrait.kt

@@ -1,11 +1,10 @@
 package foo
 
-@native
-interface NativeTrait {
+external interface NativeTrait {
     val foo: String
     fun bar(a: Int): Any
 
-    @native("boo")
+    @JsName("boo")
     fun baz(): String
 }
 

js/js.translator/testData/box/native/inheritanceInNativeClass.kt

@@ -12,9 +12,9 @@ open class B {
     open fun bar(n: Int) = 142
 }
 
-@native fun createA(): A
+external fun createA(): A
 
-@native fun createB(): B
+external fun createB(): B
 
 fun box(): String {
     val a = createA()

js/js.translator/testData/box/native/kt1519.kt

@@ -1,13 +1,11 @@
 package foo
 
-@native
-class Wow() {
+external class Wow() {
     val x: Int = noImpl
     val y: Int = noImpl
 }
 
-@native
-fun Wow.sum(): Int = noImpl
+external fun Wow.sum(): Int = noImpl
 
 fun Wow.dblSum(): Int {
     return 2 * sum()

js/js.translator/testData/box/native/kt2209.kt

@@ -1,22 +1,18 @@
 package foo
 
-@native
-interface Chrome {
+external interface Chrome {
     val extension: Extension
 }
 
-@native
-interface Extension {
+external interface Extension {
     val lastError: LastError?
 }
 
-@native
-interface LastError {
+external interface LastError {
     val message: String
 }
 
-@native
-val chrome: Chrome = noImpl
+external val chrome: Chrome = noImpl
 
 fun box(): String {
     val lastError = chrome.extension.lastError?.message

js/js.translator/testData/box/native/kt2323.kt

@@ -1,10 +1,9 @@
 package foo
 
 
-@native
-val classes: Map<String, Any> = noImpl
-@native
-val classesMutable: HashMap<String, String> = noImpl
+external val classes: Map<String, Any> = noImpl
+
+external val classesMutable: HashMap<String, String> = noImpl
 
 fun box(): String {
     classesMutable.set("why", "?")

js/js.translator/testData/box/native/nativeExtensionLikeMember.kt

@@ -1,7 +1,6 @@
 package foo
 
-@native
-open class A(val value: String) {
+external open class A(val value: String) {
 }
 
 class B : A("B") {
@@ -9,9 +8,9 @@ class B : A("B") {
     var prop: String = "B prop"
 }
 
-@native fun A.bar(): String = noImpl
+external fun A.bar(): String = noImpl
 
-@native var A.prop: String
+external var A.prop: String
     get() = noImpl
     set(value) = noImpl
 

js/js.translator/testData/box/native/nativeGetterAndNativeSetter.kt

@@ -1,7 +1,7 @@
 package foo
 
-@native("Object")
-class JsObject {
+@JsName("Object")
+external class JsObject {
     @nativeGetter
     operator fun get(a: String): Any? = noImpl
 
@@ -30,8 +30,7 @@ fun JsObject.put(a: String, v: Any?): Unit = noImpl
 
 object t{}
 
-@native
-fun getTestObject(): JsObject = noImpl
+external fun getTestObject(): JsObject = noImpl
 
 fun test(obj: JsObject, key: String, oldValue: Any?, newValue: Any) {
     assertEquals(oldValue, obj[key])

js/js.translator/testData/box/native/nativeInvoke.kt

@@ -1,7 +1,6 @@
 package foo
 
-@native
-class Function(vararg argsAndCode: String) {
+external class Function(vararg argsAndCode: String) {
     @nativeInvoke
     operator fun invoke(a: Any?): Any? = noImpl
 

js/js.translator/testData/box/native/nestedElements.kt

@@ -85,14 +85,13 @@ fun box(): String {
     return "OK";
 }
 
-@native
-object Object {
+external object Object {
     object Object {
         val a: String = noImpl
         var b: String = noImpl
         fun test(): Int = noImpl
 
-        @native("AnotherClass")
+        @JsName("AnotherClass")
         class Class(val a: String) {
             var b: String = noImpl
             fun test(): Int = noImpl
@@ -133,8 +132,8 @@ object Object {
     fun test(): Int = noImpl
 }
 
-@native("SomeClass")
-class Class {
+@JsName("SomeClass")
+external class Class {
     object Object {
         val a: String = noImpl
         var b: String = noImpl
@@ -170,16 +169,15 @@ class Class {
     }
 
     companion object {
-        @native("aaa")
+        @JsName("aaa")
         val a: Trait = noImpl
         var b: String = noImpl
         fun test(): Int = noImpl
     }
 }
 
-@native
-interface Trait {
-    @native("SomeObject")
+external interface Trait {
+    @JsName("SomeObject")
     object Object {
         val a: String = noImpl
         var b: String = noImpl
@@ -197,7 +195,7 @@ interface Trait {
         }
     }
 
-    @native("SomeTrait")
+    @JsName("SomeTrait")
     interface Trait {
         val a: String
         var b: String

js/js.translator/testData/box/native/passExtLambdaFromNative.kt

@@ -1,14 +1,13 @@
 package foo
 
-@native
-internal class A(val v: String)
+internal external class A(val v: String)
 
 internal class B {
     fun bar(a: A, extLambda: A.(Int, String) -> String): String = a.extLambda(7, "_rr_")
 }
 
-@native
-internal fun nativeBox(b: B): String = noImpl
+
+internal external fun nativeBox(b: B): String = noImpl
 
 fun box(): String {
     val r = nativeBox(B())

js/js.translator/testData/box/native/passExtLambdaToNative.kt

@@ -1,10 +1,8 @@
 package foo
 
-@native
-class A(val v: String)
+external class A(val v: String)
 
-@native
-fun bar(a: A, extLambda: A.(Int, String) -> String): String = noImpl
+external fun bar(a: A, extLambda: A.(Int, String) -> String): String = noImpl
 
 fun box(): String {
     val a = A("test")

js/js.translator/testData/box/native/passMemberOrExtFromNative.kt

@@ -1,14 +1,13 @@
 package foo
 
-@native
-class A(val v: String) {
+external class A(val v: String) {
     fun m(i:Int, s:String): String = noImpl
 }
-@native
-fun A.nativeExt(i:Int, s:String): String = noImpl
 
-@native("nativeExt2AnotherName")
-fun A.nativeExt2(i:Int, s:String): String = noImpl
+external fun A.nativeExt(i:Int, s:String): String = noImpl
+
+@JsName("nativeExt2AnotherName")
+external fun A.nativeExt2(i:Int, s:String): String = noImpl
 
 fun bar(a: A, extLambda: A.(Int, String) -> String): String = a.(extLambda)(4, "boo")
 

js/js.translator/testData/box/native/passMemberOrExtToNative.kt

@@ -8,8 +8,7 @@ class B(v: String): A(v) {
     override fun m(i:Int, s:String): String = "B.m ${this.v} $i $s"
 }
 
-@native
-fun bar(a: A, extLambda: A.(Int, String) -> String): String = noImpl
+external fun bar(a: A, extLambda: A.(Int, String) -> String): String = noImpl
 
 fun A.topLevelExt(i:Int, s:String): String = "A::topLevelExt ${this.v} $i $s"
 

js/js.translator/testData/box/native/passTopLevelFunctionFromNative.kt

@@ -1,7 +1,6 @@
 package foo
 
-@native
-fun nativeFun(i:Int, s:String): String = noImpl
+external fun nativeFun(i:Int, s:String): String = noImpl
 
 fun bar(funRef: (Int, String) -> String): String = funRef(4, "boo")
 

js/js.translator/testData/box/native/passTopLevelOrLocalFunctionToNative.kt

@@ -1,7 +1,6 @@
 package foo
 
-@native
-fun run(i:Int, s:String, funRef: (Int, String) -> String): String = noImpl
+external fun run(i:Int, s:String, funRef: (Int, String) -> String): String = noImpl
 
 fun funTopLevel(i:Int, s:String): String = "funTopLevel $i $s"
 

js/js.translator/testData/box/native/print.kt

@@ -22,8 +22,7 @@ val EXPECTED_NEWLINE_FOR_EACH = """Hello
 
 """
 
-@native
-var buffer: String = noImpl
+external var buffer: String = noImpl
 
 fun test(expected: String, initCode: String, getResult: () -> String) {
     buffer = ""

js/js.translator/testData/box/native/secondaryConstructor.kt

@@ -1,7 +1,6 @@
 package foo
 
-@native
-class A {
+external class A {
     constructor()
     constructor(s: String)
     constructor(i: Int)

js/js.translator/testData/box/native/simple.kt

@@ -1,6 +1,5 @@
 package foo
 
-@native
-fun returnFalse(): Boolean = noImpl
+external fun returnFalse(): Boolean = noImpl
 
 fun box() = if (!returnFalse()) "OK" else "fail"

js/js.translator/testData/box/native/simpleUndefined.kt

@@ -1,7 +1,6 @@
 package foo
 
-@native
-val c: Any? = noImpl
+external val c: Any? = noImpl
 
 fun box(): String {
     if (c != null) return "fail1"

js/js.translator/testData/box/native/vararg.kt

@@ -1,13 +1,12 @@
 package foo
 
-@native
-fun paramCount(vararg a: Int): Int = noImpl
+external fun paramCount(vararg a: Int): Int = noImpl
 
-@native("paramCount")
-fun anotherParamCount(vararg a: Int): Int = noImpl
+@JsName("paramCount")
+external fun anotherParamCount(vararg a: Int): Int = noImpl
 
-@native("paramCount")
-fun <T> genericParamCount(vararg a: T): Int = noImpl
+@JsName("paramCount")
+external fun <T> genericParamCount(vararg a: T): Int = noImpl
 
 // test spread operator
 fun count(vararg a: Int) = paramCount(*a)
@@ -15,14 +14,11 @@ fun count(vararg a: Int) = paramCount(*a)
 // test spread operator
 fun anotherCount(vararg a: Int) = anotherParamCount(*a)
 
-@native
-fun test3(bar: Bar, dummy: Int, vararg args: Int): Boolean = noImpl
+external fun test3(bar: Bar, dummy: Int, vararg args: Int): Boolean = noImpl
 
-@native
-fun Bar.test2(order: Int, dummy: Int, vararg args: Int): Boolean = noImpl
+external fun Bar.test2(order: Int, dummy: Int, vararg args: Int): Boolean = noImpl
 
-@native
-class Bar(val size: Int, order: Int = 0) {
+external class Bar(val size: Int, order: Int = 0) {
     fun test(order: Int, dummy: Int, vararg args: Int): Boolean = noImpl
     companion object {
         fun startNewTest(): Boolean = noImpl
@@ -30,8 +26,7 @@ class Bar(val size: Int, order: Int = 0) {
     }
 }
 
-@native
-object obj {
+external object obj {
     fun test(size: Int, vararg args: Int): Boolean = noImpl
 }
 
@@ -43,8 +38,7 @@ fun spreadInMethodCallWithReceiver(size: Int, vararg args: Int) = Bar(size).test
 
 fun spreadInPackageMethodCall(size: Int, vararg args: Int) = test3(Bar(size), 1, *args)
 
-@native
-fun testNativeVarargWithFunLit(vararg args: Int, f: (a: IntArray) -> Boolean): Boolean = noImpl
+external fun testNativeVarargWithFunLit(vararg args: Int, f: (a: IntArray) -> Boolean): Boolean = noImpl
 
 fun testSpreadOperatorWithSafeCall(a: Bar?, expected: Boolean?, vararg args: Int): Boolean {
     return a?.test(0, 1, *args) == expected
@@ -59,14 +53,11 @@ fun testCallOrder(vararg args: Int) =
         Bar(args.size, 0).test(1, 1, *args) && Bar(args.size, 2).test(3, 1, *args) &&
         !Bar.hasOrderProblem
 
-@native
-fun sumOfParameters(x: Int, y: Int, vararg a: Int): Int = noImpl
+external fun sumOfParameters(x: Int, y: Int, vararg a: Int): Int = noImpl
 
-@native
-fun sumFunValuesOnParameters(x: Int, y: Int, vararg a: Int, f: (Int) -> Int): Int = noImpl
+external fun sumFunValuesOnParameters(x: Int, y: Int, vararg a: Int, f: (Int) -> Int): Int = noImpl
 
-@native
-fun <T> idArrayVarArg(vararg a: Array<T>): Array<T> = noImpl
+external fun <T> idArrayVarArg(vararg a: Array<T>): Array<T> = noImpl
 
 fun box(): String {
     if (paramCount() != 0)

js/js.translator/testData/box/nestedTypes/outerNative.kt

@@ -1,6 +1,6 @@
 package foo
 
-@native class A(x: Int) {
+external class A(x: Int) {
     var x: Int
         get() = noImpl
         set(value) = noImpl

js/js.translator/testData/box/propertyAccess/enumerable.kt

@@ -1,11 +1,9 @@
 // FILE: enumerable.kt
 package foo
 
-@native
-fun <T> _enumerate(o: T): T = noImpl
+external fun <T> _enumerate(o: T): T = noImpl
 
-@native
-fun <T> _findFirst(o: Any): T = noImpl
+external fun <T> _findFirst(o: Any): T = noImpl
 
 class Test() {
     val a: Int = 100

js/js.translator/testData/box/propertyAccess/nativePropertiesNameClashes.kt

@@ -3,8 +3,8 @@ package foo
 val PACKAGE = "kotlin.modules.JS_TESTS.foo"
 
 class A
-@native val Any.__proto__: String get() = noImpl
-@native val A.__proto__: String get() = noImpl
+external val Any.__proto__: String get() = noImpl
+external val A.__proto__: String get() = noImpl
 
 fun box(): String {
     val a = A()

js/js.translator/testData/box/trait/checkImplementationCharacteristics.kt

@@ -9,7 +9,7 @@ public interface B : A {
     }
 }
 
-@native class Function(vararg args: String)
+external class Function(vararg args: String)
 
 val hasProp = Function("obj, prop", "return obj[prop] !== undefined") as ((Any, String) -> Boolean)
 

js/js.translator/testData/jsTester/jsTester.kt

@@ -1,7 +1,5 @@
 package kotlin.test
 
-import kotlin.test.*
-
 fun init() {
     asserter = JsTestsAsserter()
 }
@@ -10,8 +8,8 @@ public class JsTestsAsserter() : Asserter {
     public override fun fail(message: String?): Nothing = failWithMessage(message)
 }
 
-@native("JsTests.assert")
-public fun assert(value: Boolean, message: String?): Unit = noImpl
+@JsName("JsTests.assert")
+public external fun assert(value: Boolean, message: String?): Unit = noImpl
 
-@native("JsTests.fail")
-private fun failWithMessage(message: String?): Nothing = noImpl
+@JsName("JsTests.fail")
+private external fun failWithMessage(message: String?): Nothing = noImpl