commit a6f0fc09f5b8c532590ea9c96246178d39495ef3
author Roberto Lublinerman <rluble@google.com> Mon May 30 21:59:25 2016 -0700
committer Roberto Lublinerman <rluble@google.com> Tue Jun 14 00:25:00 2016 +0000
tree 09f778a0554392b3bf333a813f530a01a895c840
parent 68213f55d14b8f74caf687c24711f40fdb04ef21

Allow name conflicts in native properties.

A native property is allowed to have the same name as a native method.
A property is considered native if both setter and getter are native
if they exist.

Bug: #9327
Bug-Link: http://github.com/gwtproject/gwt/issues/9327
Change-Id: I047fae52e344453eb1222c5a8e594f5f4cf53bff

dev/core/src/com/google/gwt/dev/jjs/impl/JsInteropRestrictionChecker.java

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JsInteropRestrictionChecker.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JsInteropRestrictionChecker.java
index 1519ca6..8da4fc4 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/JsInteropRestrictionChecker.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/JsInteropRestrictionChecker.java
@@ -533,7 +533,7 @@
       return;
     }
 
-    if (oldJsMember.isNativeMethod() && newJsMember.isNativeMethod()) {
+    if (oldJsMember.isJsNative() && newJsMember.isJsNative()) {
       return;
     }
 
@@ -799,8 +799,8 @@
       this.getter = getter;
     }
 
-    public boolean isNativeMethod() {
-      return member instanceof JMethod && member.isJsNative() && !isPropertyAccessor();
+    public boolean isJsNative() {
+      return member.isJsNative();
     }
 
     public boolean isPropertyAccessor() {

dev/core/test/com/google/gwt/dev/jjs/impl/JsInteropRestrictionCheckerTest.java

diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/JsInteropRestrictionCheckerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/JsInteropRestrictionCheckerTest.java
index ae5835a..529583e 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/JsInteropRestrictionCheckerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/JsInteropRestrictionCheckerTest.java
@@ -262,6 +262,30 @@
             + "cannot both use the same JavaScript name 'x'.");
   }
 
+  public void testCollidingNativeJsPropertiesSucceeds() throws Exception {
+    addSnippetImport("jsinterop.annotations.JsType");
+    addSnippetImport("jsinterop.annotations.JsMethod");
+    addSnippetImport("jsinterop.annotations.JsProperty");
+    addSnippetClassDecl(
+        "@JsType(isNative=true)",
+        "public static class Buggy {",
+        "  @JsMethod",
+        "  public native int now();",
+        "  @JsProperty",
+        "  public native Object getNow();",
+        "  @JsMethod",
+        "  public static native int other();",
+        "  @JsProperty",
+        "  public static native Object getOther();",
+        "  @JsMethod",
+        "  public static native int another();",
+        "  @JsProperty",
+        "  public static Object another;",
+        "}");
+
+    assertBuggySucceeds();
+  }
+
   public void testCollidingJsPropertiesTwoSettersFails() throws Exception {
     addSnippetImport("jsinterop.annotations.JsType");
     addSnippetImport("jsinterop.annotations.JsProperty");