GROOVY-8859

groovy · Sep 16, 2023 · 240d2d3 · 240d2d3
1 parent 653f746
commit 240d2d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...ore.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/TraitInferencingTests.java b/...ore.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/TraitInferencingTests.java
@@ -926,7 +926,7 @@ public void testPrivateMethod1() {
         assertExprType(source, "check", "java.lang.Boolean");
     }
 
-    @Test
+    @Test // https://issues.apache.org/jira/browse/GROOVY-8859
     public void testPrivateMethod2() {
         //@formatter:off
         String contents =
@@ -943,8 +943,8 @@ public void testPrivateMethod2() {
             "}";
         //@formatter:on
 
-        assertDeclType(contents, "method", "B");
-        assertExprType(contents, "method", "java.lang.Void");
+        int offset = contents.lastIndexOf("method");
+        assertUnknownConfidence(contents, offset, offset + 6);
     }
 
     @Test

diff --git a/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/SimpleTypeLookup.java b/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/SimpleTypeLookup.java
@@ -789,6 +789,7 @@ protected MethodNode findMethodDeclaration(final String name, final ClassNode de
         for (ClassNode type : types) {
             MethodNode innerCandidate = null;
             List<MethodNode> candidates = getMethods(name, type);
+            candidates.removeIf(m -> m.isPrivate() && !m.getDeclaringClass().equals(declaringType)); // GROOVY-8859
             if (!candidates.isEmpty()) {
                 innerCandidate = findMethodDeclaration0(candidates, argumentTypes, isStaticExpression);
                 if (innerCandidate != null) {
@@ -1179,7 +1180,7 @@ protected static boolean isCompatible(final AnnotatedNode declaration, final boo
     }
 
     protected static boolean isNotThisOrOuterClass(final ClassNode thisType, final ClassNode declaringClass) {
-        return (!thisType.equals(declaringClass) && !thisType.getOuterClasses().contains(declaringClass) && !(implementsTrait(thisType) && thisType.implementsInterface(declaringClass)));
+        return !thisType.equals(declaringClass) && !thisType.getOuterClasses().contains(declaringClass) && !(implementsTrait(thisType) && thisType.implementsInterface(declaringClass));
     }
 
     /**