Fix for #1267: find trait methods during reconcile type-checking

groovy · Jun 15, 2021 · b400f3d · b400f3d
1 parent 36cbc7a
commit b400f3d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/...re.tests.builder/src/org/eclipse/jdt/core/groovy/tests/builder/BasicGroovyBuildTests.java b/...re.tests.builder/src/org/eclipse/jdt/core/groovy/tests/builder/BasicGroovyBuildTests.java
@@ -2936,7 +2936,7 @@ public void testTraitBasics() throws Exception {
         expectingNoProblems();
     }
 
-    @Test
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1267
     public void testTraitBasics2() throws Exception {
         IPath[] paths = createSimpleProject("Project", true);
 
@@ -2947,7 +2947,11 @@ public void testTraitBasics2() throws Exception {
             "}\n");
         IPath d = env.addGroovyClass(paths[1], "p", "D",
             "package p\n" +
+            "@groovy.transform.TypeChecked\n" +
             "class D extends C {\n" +
+            "  void test() {\n" +
+            "    proc()\n" +
+            "  }\n" +
             "}\n");
         env.addGroovyClass(paths[1], "p", "T",
             "package p\n" +

diff --git a/...rg.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5371,7 +5371,9 @@ protected List<MethodNode> findMethodsWithGenerated(ClassNode receiver, String n
         } else {
             List<MethodNode> interfaceMethods = new ArrayList<>();
             collectAllInterfaceMethodsByName(receiver, name, interfaceMethods);
-            interfaceMethods.stream().filter(MethodNode::isDefault).forEach(methods::add);
+            interfaceMethods.stream().filter(mn -> mn.isDefault() || (mn.isPublic()
+                && !mn.isStatic() && !mn.isAbstract() && Traits.isTrait(mn.getDeclaringClass()))
+            ).forEach(methods::add);
         }
         if (receiver.isInterface()) {
             methods.addAll(OBJECT_TYPE.getMethods(name));

diff --git a/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5143,7 +5143,13 @@ protected List<MethodNode> findMethodsWithGenerated(final ClassNode receiver, fi
         } else { // GROOVY-9890: always search for default methods
             List<MethodNode> interfaceMethods = new ArrayList<>();
             collectAllInterfaceMethodsByName(receiver, name, interfaceMethods);
+            /* GRECLIPSE edit
             interfaceMethods.stream().filter(MethodNode::isDefault).forEach(methods::add);
+            */
+            interfaceMethods.stream().filter(mn -> mn.isDefault() || (mn.isPublic()
+                && !mn.isStatic() && !mn.isAbstract() && Traits.isTrait(mn.getDeclaringClass()))
+            ).forEach(methods::add);
+            // GRECLIPSE end
         }
         if (receiver.isInterface()) {
             methods.addAll(OBJECT_TYPE.getMethods(name));

diff --git a/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4983,7 +4983,13 @@ protected List<MethodNode> findMethodsWithGenerated(final ClassNode receiver, fi
         } else { // GROOVY-9890: always search for default methods
             List<MethodNode> interfaceMethods = new ArrayList<>();
             collectAllInterfaceMethodsByName(receiver, name, interfaceMethods);
+            /* GRECLIPSE edit
             interfaceMethods.stream().filter(MethodNode::isDefault).forEach(methods::add);
+            */
+            interfaceMethods.stream().filter(mn -> mn.isDefault() || (mn.isPublic()
+                && !mn.isStatic() && !mn.isAbstract() && Traits.isTrait(mn.getDeclaringClass()))
+            ).forEach(methods::add);
+            // GRECLIPSE end
         }
         if (receiver.isInterface()) {
             methods.addAll(OBJECT_TYPE.getMethods(name));