Fix for #924: check original method if AIC cannot be found in gen method

groovy · Jul 15, 2019 · ffa0b1e · ffa0b1e
1 parent d2555b6
commit ffa0b1e
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/...dt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java b/...dt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java
@@ -1918,6 +1918,24 @@ private IType findAnonType(ClassNode type) {
                     return (IType) child;
                 }
             }
+            // check for method with AIC in default argument expression
+            if (enclosingElement instanceof IMethod) {
+                MethodNode meth = findMethodNode((IMethod) enclosingElement);
+                if (meth != null && meth.getOriginal() != meth) {
+                    for (IJavaElement elem : occurrenceCounts.keySet()) {
+                        if (elem instanceof IMethod &&
+                                elem != enclosingElement &&
+                                elem.getElementName().equals(meth.getName())) {
+                            for (IJavaElement child : ((IMember) elem).getChildren()) {
+                                if (child instanceof IType && ((IType) child).isAnonymous() &&
+                                          ((IType) child).getOccurrenceCount() == occurrenceCount) {
+                                    return (IType) child;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         } catch (JavaModelException e) {
             log(e, "Error visiting children of %s", type.getName());
         }