Starts calling constructor of super native types.

This mimics the ES6 style class constructor behavior and also a better match for Java semantics. Change-Id: I103557142ba5a5487cbe034a4a7558d2f60c72e5 Review-Link: https://gwt-review.googlesource.com/#/c/13913/
gwtproject · Nov 5, 2015 · 38039e3 · 38039e3
1 parent 3345e54
commit 38039e3
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 47 deletions.
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
@@ -893,11 +893,10 @@ private JsExpression dispatchToStatic(JsExpression unnecessaryQualifier, JMethod
     private JsExpression dispatchToSuper(
         JsExpression instance, JMethod method, List<JsExpression> args, SourceInfo sourceInfo) {
       JsNameRef methodNameRef;
-      if (method.isConstructor()) {
+      if (method.isJsNative()) {
-        // We don't generate calls to super native constructors (yet).
+        // Construct Constructor.prototype.jsname or Constructor.
-        if (method.isJsNative()) {
+        methodNameRef = createJsQualifier(method.getQualifiedJsName(), sourceInfo);
-          return JsNullLiteral.INSTANCE;
+      } else if (method.isConstructor()) {
-        }
         /*
          * Constructor calls through {@code this} and {@code super} are always dispatched statically
          * using the constructor function name (constructors are always defined as top level
@@ -913,13 +912,8 @@ private JsExpression dispatchToSuper(
         // {@link Impl.getNameOf} or calls to the native classes.
 
         JDeclaredType superClass = method.getEnclosingType();
-        if (method.isJsNative()) {
+        JsExpression protoRef = getPrototypeQualifierViaLookup(superClass, sourceInfo);
-          // Construct jsPrototype.prototype.jsname
+        methodNameRef = polymorphicNames.get(method).makeQualifiedRef(sourceInfo, protoRef);
-          methodNameRef = createJsQualifier(method.getQualifiedJsName(), sourceInfo);
-        } else {
-          JsExpression protoRef = getPrototypeQualifierViaLookup(superClass, sourceInfo);
-          methodNameRef = polymorphicNames.get(method).makeQualifiedRef(sourceInfo, protoRef);
-        }
       }
 
       // <method_qualifier>.call(instance, args);

diff --git a/user/test/com/google/gwt/core/client/interop/JsPropertyTest.java b/user/test/com/google/gwt/core/client/interop/JsPropertyTest.java
@@ -15,8 +15,6 @@
  */
 package com.google.gwt.core.client.interop;
 
-import static com.google.gwt.core.client.ScriptInjector.TOP_WINDOW;
-
 import static jsinterop.annotations.JsPackage.GLOBAL;
 
 import com.google.gwt.core.client.JavaScriptObject;
@@ -43,15 +41,16 @@ public String getModuleName() {
 
   @Override
   protected void gwtSetUp() throws Exception {
-    ScriptInjector.fromString("function JsPropertyTest_MyNativeJsType() {}\n"
+    ScriptInjector.fromString(
+        "function JsPropertyTest_MyNativeJsType(x) { this.x = x; this.ctorExecuted = true; }\n"
         + "JsPropertyTest_MyNativeJsType.staticX = 33;"
         + "JsPropertyTest_MyNativeJsType.answerToLife = function() { return 42;};"
         + "JsPropertyTest_MyNativeJsType.prototype.sum = "
         + "    function sum(bias) { return this.x + bias; };"
         + "function JsPropertyTest_MyNativeJsTypeInterface() {}\n"
         + "JsPropertyTest_MyNativeJsTypeInterface.prototype.sum = "
         + "    function sum(bias) { return this.x + bias; };")
-        .setWindow(TOP_WINDOW).inject();
+        .setWindow(ScriptInjector.TOP_WINDOW).inject();
   }
 
   @JsType
@@ -148,6 +147,8 @@ static class MyNativeJsType {
 
     public static native int answerToLife();
 
+    public boolean ctorExecuted;
+
     public int x;
 
     @JsProperty
@@ -166,6 +167,7 @@ public void testNativeJsType() {
     assertEquals(42, MyNativeJsType.answerToLife());
 
     MyNativeJsType obj = new MyNativeJsType();
+    assertTrue(obj.ctorExecuted);
     assertTrue(isUndefined(obj.x));
     obj.x = 72;
     assertEquals(72, obj.x);
@@ -191,6 +193,7 @@ public int sum(int bias) {
 
   public void testNativeJsTypeSubclass() {
     MyNativeJsTypeSubclass mc = new MyNativeJsTypeSubclass();
+    assertTrue(mc.ctorExecuted);
     assertEquals(143, mc.sum(1));
 
     mc.x = -mc.x;
@@ -199,6 +202,40 @@ public void testNativeJsTypeSubclass() {
     assertEquals(52, mc.getY());
   }
 
+  static class MyNativeJsTypeSubclassNoOverride extends MyNativeJsType { }
+
+  // TODO(rluble): enable when the subclass is setup correctly.
+  public void _disabled_testNativeJsTypeSubclassNoOverride() {
+    MyNativeJsTypeSubclassNoOverride myNativeJsType = new MyNativeJsTypeSubclassNoOverride();
+    myNativeJsType.x = 12;
+    assertEquals(42, myNativeJsType.sum(30));
+  }
+
+  @JsType(isNative = true, namespace = GLOBAL, name = "JsPropertyTest_MyNativeJsType")
+  static class MyNativeJsTypeWithConstructor {
+    public MyNativeJsTypeWithConstructor(int x) { }
+    public boolean ctorExecuted;
+    public int x;
+  }
+
+  public void testNativeJsTypeWithConstructor() {
+    MyNativeJsTypeWithConstructor obj = new MyNativeJsTypeWithConstructor(12);
+    assertTrue(obj.ctorExecuted);
+    assertEquals(12, obj.x);
+  }
+
+  static class MyNativeJsTypeWithConstructorSubclass extends MyNativeJsTypeWithConstructor {
+    public MyNativeJsTypeWithConstructorSubclass(int x) {
+      super(x);
+    }
+  }
+
+  public void testNativeJsTypeWithConstructorSubclass() {
+    MyNativeJsTypeWithConstructorSubclass obj = new MyNativeJsTypeWithConstructorSubclass(12);
+    assertTrue(obj.ctorExecuted);
+    assertEquals(12, obj.x);
+  }
+
   @JsType(isNative = true, namespace = GLOBAL, name = "JsPropertyTest_MyNativeJsTypeInterface")
   interface MyNativeJsTypeInterface {
     @JsProperty

diff --git a/user/test/com/google/gwt/core/client/interop/JsTypeTest.java b/user/test/com/google/gwt/core/client/interop/JsTypeTest.java
@@ -42,9 +42,7 @@ public String getModuleName() {
 
   @Override
   protected void gwtSetUp() throws Exception {
-    ScriptInjector.fromString("function JsTypeTest_MyNativeJsType() {}\n"
+    ScriptInjector.fromString("function JsTypeTest_MyNativeJsType() {}")
-        + "JsTypeTest_MyNativeJsType.prototype.sum = "
-        + "    function sum(bias) { return this.y + bias; };")
         .setWindow(ScriptInjector.TOP_WINDOW)
         .inject();
   }
@@ -310,14 +308,29 @@ public void testInstanceOf_concreteJsType() {
     assertFalse(object instanceof MyNativeJsTypeInterfaceImpl[][]);
   }
 
+  @JsType(isNative = true, namespace = GLOBAL, name = "JsTypeTest_MyNativeJsType")
+  static class MyNativeJsType { }
+
+  static class MyNativeJsTypeSubclass extends MyNativeJsType { }
+
+  static class MyNativeJsTypeSubclassWithIterator extends MyNativeJsType implements Iterable {
+    @Override
+    public Iterator iterator() {
+      return null;
+    }
+  }
+
   public void testInstanceOf_extendsJsTypeWithProto() {
     // Foils type tightening.
-    Object object = new MyCustomHtmlButtonWithIterator();
+    Object object = new MyNativeJsTypeSubclassWithIterator();
 
     assertTrue(object instanceof Object);
-    assertTrue(object instanceof HTMLElementAnotherConcreteNativeJsType);
+    assertTrue(object instanceof MyNativeJsType);
-    assertTrue(object instanceof HTMLButtonElement);
+    assertFalse(object instanceof MyNativeJsTypeSubclass);
-    assertTrue(object instanceof HTMLElementConcreteNativeJsType);
+    assertTrue(object instanceof MyNativeJsTypeSubclassWithIterator);
+    assertFalse(object instanceof HTMLElementAnotherConcreteNativeJsType);
+    assertFalse(object instanceof HTMLButtonElement);
+    assertFalse(object instanceof HTMLElementConcreteNativeJsType);
     assertTrue(object instanceof Iterable);
     assertFalse(object instanceof MyNativeJsTypeInterfaceImpl);
     assertFalse(object instanceof ElementLikeNativeInterfaceImpl);
@@ -328,34 +341,11 @@ public void testInstanceOf_extendsJsTypeWithProto() {
     assertFalse(object instanceof MyNativeJsTypeInterfaceImpl[][]);
   }
 
-  @JsType(isNative = true, namespace = GLOBAL, name = "JsTypeTest_MyNativeJsType")
-  static class MyNativeJsType {
-    @JsProperty
-    public native int getY();
-
-    @JsProperty
-    public native void setY(int value);
-
-    public native int sum(int bias);
-  }
-
-  static class MyNativeJsTypeSubclass extends MyNativeJsType {
-  }
-
-  // TODO(rluble): enable when the subclass is setup correctly.
-  public void _disabled_testNativeJsTypeSubclass() {
-    MyNativeJsTypeSubclass myNativeJsTypeSubclass = new MyNativeJsTypeSubclass();
-    myNativeJsTypeSubclass.setY(12);
-    assertEquals(42, myNativeJsTypeSubclass.sum(30));
-    assertTrue(myNativeJsTypeSubclass instanceof MyNativeJsType);
-    assertTrue(myNativeJsTypeSubclass instanceof MyNativeJsTypeSubclass);
-  }
-
   @JsType(isNative = true, namespace = "testfoo.bar")
   static class MyNamespacedNativeJsType {
   }
 
-  public void _testInstanceOf_withNameSpace() {
+  public void testInstanceOf_withNameSpace() {
     Object obj1 = createMyNamespacedJsInterface();
     Object obj2 = createMyWrongNamespacedJsInterface();