Merge pull request scala-js#1885 from sjrd/js-native-annotation

Fix scala-js#1868: Add an annotation `@js.native` for native JS types.

Author: sjrd

compiler/src/main/scala/org/scalajs/core/compiler/JSDefinitions.scala

@@ -29,6 +29,8 @@ trait JSDefinitions { self: JSGlobalAddons =>
       lazy val JSPackage_debugger      = getMemberMethod(ScalaJSJSPackage, newTermName("debugger"))
       lazy val JSPackage_native        = getMemberMethod(ScalaJSJSPackage, newTermName("native"))
 
+    lazy val JSNativeAnnotation = getRequiredClass("scala.scalajs.js.native")
+
     lazy val JSAnyClass       = getRequiredClass("scala.scalajs.js.Any")
     lazy val JSDynamicClass   = getRequiredClass("scala.scalajs.js.Dynamic")
     lazy val JSDictionaryClass = getRequiredClass("scala.scalajs.js.Dictionary")

compiler/src/main/scala/org/scalajs/core/compiler/PrepJSInterop.scala

@@ -404,6 +404,18 @@ abstract class PrepJSInterop extends plugins.PluginComponent
 
       val isJSNative = !sym.hasAnnotation(ScalaJSDefinedAnnotation)
 
+      if (isJSNative && !isJSAnonFun &&
+          !sym.hasAnnotation(JSNativeAnnotation)) {
+        reporter.warning(implDef.pos,
+            "Classes, traits and objects inheriting from js.Any should be " +
+            "annotated with @js.native, unless they have @ScalaJSDefined. " +
+            "The default will switch to Scala.js-defined in the next major " +
+            "version of Scala.js.")
+      } else if (!isJSNative && sym.hasAnnotation(JSNativeAnnotation)) {
+        reporter.error(implDef.pos,
+            "@ScalaJSDefined and @js.native cannot be used together")
+      }
+
       def strKind =
         if (sym.isTrait) "trait"
         else if (sym.isModuleClass) "object"

compiler/src/test/scala/org/scalajs/core/compiler/test/DiverseErrorsTest.scala

@@ -15,6 +15,7 @@ class DiverseErrorsTest extends DirectTest with TestHelpers  {
   def noIsInstanceOnJSRaw: Unit = {
 
     """
+    @js.native
     trait JSRaw extends js.Object
 
     class A {
@@ -23,7 +24,7 @@ class DiverseErrorsTest extends DirectTest with TestHelpers  {
     }
     """ hasErrors
     """
-      |newSource1.scala:7: error: isInstanceOf[JSRaw] not supported because it is a raw JS trait
+      |newSource1.scala:8: error: isInstanceOf[JSRaw] not supported because it is a raw JS trait
       |      def x = a.isInstanceOf[JSRaw]
       |                            ^
     """
@@ -57,9 +58,9 @@ class DiverseErrorsTest extends DirectTest with TestHelpers  {
     """
 
     """
-    class NativeJSClass extends js.Object
-    trait NativeJSTrait extends js.Object
-    object NativeJSObject extends js.Object
+    @js.native class NativeJSClass extends js.Object
+    @js.native trait NativeJSTrait extends js.Object
+    @js.native object NativeJSObject extends js.Object
 
     @ScalaJSDefined class JSClass extends js.Object
     @ScalaJSDefined trait JSTrait extends js.Object
@@ -124,7 +125,7 @@ class DiverseErrorsTest extends DirectTest with TestHelpers  {
     import scala.scalajs.runtime
 
     object ScalaObject
-    object NativeJSObject extends js.Object
+    @js.native object NativeJSObject extends js.Object
     @ScalaJSDefined object JSObject extends js.Object
 
     object A {
@@ -151,9 +152,9 @@ class DiverseErrorsTest extends DirectTest with TestHelpers  {
     class ScalaClass
     trait ScalaTrait
 
-    class NativeJSClass extends js.Object
-    trait NativeJSTrait extends js.Object
-    object NativeJSObject extends js.Object
+    @js.native class NativeJSClass extends js.Object
+    @js.native trait NativeJSTrait extends js.Object
+    @js.native object NativeJSObject extends js.Object
 
     @ScalaJSDefined class JSClass extends js.Object
     @ScalaJSDefined trait JSTrait extends js.Object

compiler/src/test/scala/org/scalajs/core/compiler/test/JSExportTest.scala

@@ -375,6 +375,7 @@ class JSExportTest extends DirectTest with TestHelpers {
     @ScalaJSDefined trait Test2 extends js.Object
 
     @JSExport
+    @js.native
     trait Test3 extends js.Object
     """ hasErrors
     """
@@ -564,6 +565,7 @@ class JSExportTest extends DirectTest with TestHelpers {
     import scala.scalajs.js
 
     @JSExport
+    @js.native
     object A extends js.Object
     """ hasErrors
     """
@@ -576,6 +578,7 @@ class JSExportTest extends DirectTest with TestHelpers {
     import scala.scalajs.js
 
     @JSExport
+    @js.native
     trait A extends js.Object
     """ hasErrors
     """
@@ -588,6 +591,7 @@ class JSExportTest extends DirectTest with TestHelpers {
     import scala.scalajs.js
 
     @JSExport
+    @js.native
     class A extends js.Object {
       @JSExport
       def this(x: Int) = this()
@@ -597,7 +601,7 @@ class JSExportTest extends DirectTest with TestHelpers {
       |newSource1.scala:5: error: You may not export a native JS class or object
       |    @JSExport
       |     ^
-      |newSource1.scala:7: error: You may not export a constructor of a subclass of js.Any
+      |newSource1.scala:8: error: You may not export a constructor of a subclass of js.Any
       |      @JSExport
       |       ^
     """
@@ -610,13 +614,14 @@ class JSExportTest extends DirectTest with TestHelpers {
     """
     import scala.scalajs.js
 
+    @js.native
     class A extends js.Object {
       @JSExport
       def foo: Int = js.native
     }
     """ hasErrors
     """
-      |newSource1.scala:6: error: You may not export a method of a subclass of js.Any
+      |newSource1.scala:7: error: You may not export a method of a subclass of js.Any
       |      @JSExport
       |       ^
     """