GROOVY-10592

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DeclarationInferencingTests.java

@@ -1327,6 +1327,26 @@ public void testJavaInterfaceWithDefaultMethod3() {
         }
     }
 
+    @Test // GROOVY-10592
+    public void testJavaInterfaceWithStaticMethod() {
+        //@formatter:off
+        createJavaUnit("I",
+            "public interface I {\n" +
+            "  static C getP() {\n" +
+            "  }\n" +
+            "  class C {\n" +
+            "  }\n" +
+            "}");
+
+        String contents =
+            "I.getP();" +
+            "I.p"; // XXX
+        //@formatter:on
+
+        assertKnown(contents, "getP", "I", "getP", DeclarationKind.METHOD);
+        assertUnknown(contents, "p");
+    }
+
     @Test // GRECLIPSE-1105
     public void testFluentInterfaceWithFieldNameConflicts() {
         //@formatter:off

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java

@@ -7386,4 +7386,28 @@ public void testCompileStatic10579() {
 
         runConformTest(sources, "15");
     }
+
+    @Test
+    public void testCompileStatic10592() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.CompileStatic\n" +
+            "void test() {\n" +
+            "  print Face.getValue()\n" +
+            "  print Face.value\n" +
+            "}\n" +
+            "test()\n",
+
+            "Face.java",
+            "interface Face {\n" +
+            "  static String getValue() {\n" +
+            "    return \"works\";\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "worksworks");
+    }
 }

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java

@@ -5601,4 +5601,28 @@ public void testTypeChecked10576() {
 
         runConformTest(sources, "[foo:bar]");
     }
+
+    @Test
+    public void testTypeChecked10592() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  print Face.getValue()\n" +
+            "  print Face.value\n" +
+            "}\n" +
+            "test()\n",
+
+            "Face.java",
+            "interface Face {\n" +
+            "  static String getValue() {\n" +
+            "    return \"works\";\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "works", "groovy.lang.MissingPropertyException: No such property: value for class: Face");
+    }
 }

base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/SimpleTypeLookup.java

@@ -888,7 +888,8 @@ private static Stream<MethodNode> findMetaObjectMethods(final ClassNode declarin
 
     private static Optional<MethodNode> findPropertyAccessorMethod(final String propertyName, final ClassNode declaringType, final boolean isLhsExpression, final boolean isStaticExpression, final List<ClassNode> methodCallArgumentTypes) {
         Stream<MethodNode> accessors = AccessorSupport.findAccessorMethodsForPropertyName(propertyName, declaringType, false, !isLhsExpression ? READER : WRITER);
-        accessors = accessors.filter(accessor -> isCompatible(accessor, isStaticExpression) && !isTraitBridge(accessor));
+        accessors = accessors.filter(accessor -> isCompatible(accessor, isStaticExpression) && !isTraitBridge(accessor) &&
+            (!accessor.isStatic() || !accessor.getDeclaringClass().isInterface())); // GROOVY-10592
         if (isLhsExpression) {
             // use methodCallArgumentTypes to select closer match
             accessors = accessors.sorted((m1, m2) -> (m1 == closer(m2, m1, methodCallArgumentTypes) ? -1 : +1));