GROOVY-6882 pt.2

Author: eric-milles

base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -5132,6 +5132,7 @@ public static String extractPropertyNameFromMethodName(String prefix, String met
     }
 
     protected void collectAllInterfaceMethodsByName(final ClassNode receiver, final String name, final List<MethodNode> methods) {
+        /* GRECLIPSE edit -- GROOVY-6882
         ClassNode cNode = receiver;
         while (cNode != null) {
             ClassNode[] interfaces = cNode.getInterfaces();
@@ -5144,6 +5145,17 @@ protected void collectAllInterfaceMethodsByName(final ClassNode receiver, final
             }
             cNode = cNode.getSuperClass();
         }
+        */
+        Set<ClassNode> done = new LinkedHashSet<>();
+        for (ClassNode next = receiver; next != null; next = next.getSuperClass()) {
+            done.add(next);
+            for (ClassNode face : next.getAllInterfaces()) {
+                if (done.add(face)) {
+                    methods.addAll(face.getDeclaredMethods(name));
+                }
+            }
+        }
+        // GRECLIPSE end
     }
 
     protected ClassNode getType(final ASTNode exp) {

base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -4898,6 +4898,7 @@ public static String extractPropertyNameFromMethodName(final String prefix, fina
     }
 
     protected void collectAllInterfaceMethodsByName(final ClassNode receiver, final String name, final List<MethodNode> methods) {
+        /* GRECLIPSE edit -- GROOVY-6882
         ClassNode cNode = receiver;
         while (cNode != null) {
             ClassNode[] interfaces = cNode.getInterfaces();
@@ -4910,6 +4911,17 @@ protected void collectAllInterfaceMethodsByName(final ClassNode receiver, final
             }
             cNode = cNode.getSuperClass();
         }
+        */
+        Set<ClassNode> done = new LinkedHashSet<>();
+        for (ClassNode next = receiver; next != null; next = next.getSuperClass()) {
+            done.add(next);
+            for (ClassNode face : next.getAllInterfaces()) {
+                if (done.add(face)) {
+                    methods.addAll(face.getDeclaredMethods(name));
+                }
+            }
+        }
+        // GRECLIPSE end
     }
 
     protected ClassNode getType(final ASTNode exp) {