MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

overload resolution: static methods from super interfaces should be skipped in favor to instance methods (IDEA-216009)

Browse Source 
GitOrigin-RevId: f172ea91498434cd956010df286dc418334a83b9
This commit is contained in:
Anna Kozlova
2019-06-13 22:25:23 +02:00
committed by intellij-monorepo-bot
parent e5aabb8ae1
commit 67d165e584
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
View File

@@ -60,6 +60,9 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
if (conflicts.isEmpty()) return null;
if (conflicts.size() == 1) return conflicts.get(0);
checkStaticMethodsOfInterfaces(conflicts);
if (conflicts.size() == 1) return conflicts.get(0);
final Map<MethodCandidateInfo, PsiSubstitutor> map = FactoryMap.create(key -> key.getSubstitutor(false));
boolean atLeastOneMatch = checkParametersNumber(conflicts, getActualParametersLength(), map, true);
if (conflicts.size() == 1) return conflicts.get(0);
@@ -73,9 +76,6 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
checkParametersNumber(conflicts, getActualParametersLength(), map, false);
if (conflicts.size() == 1) return conflicts.get(0);
checkStaticMethodsOfInterfaces(conflicts);
if (conflicts.size() == 1) return conflicts.get(0);
if (atLeastOneMatch) {
checkPotentiallyCompatibleMethods(conflicts);
if (conflicts.size() == 1) return conflicts.get(0);
@@ -303,8 +303,12 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
}
else if (expression == null && !ImportsUtil.hasStaticImportOn(parent, method, true)) {
PsiClass qualifierClass = PsiTreeUtil.getParentOfType(parent, PsiClass.class);
if (qualifierClass != null && !PsiTreeUtil.isAncestor(method.getContainingClass(), qualifierClass, true)) {
return qualifierClass;
if (qualifierClass != null) {
PsiClass containingClass = method.getContainingClass();
if (!PsiTreeUtil.isAncestor(containingClass, qualifierClass, true) ||
qualifierClass.isInheritor(containingClass, true)) {
return qualifierClass;
}
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/PreferMethodInsideSameComb.java Normal file
View File

@@ -0,0 +1,11 @@
interface ToStringBug {
static void toString(String s) {}
class Inner implements ToStringBug {
{
toString<error descr="'toString()' in 'java.lang.Object' cannot be applied to '(java.lang.String)'">( "x")</error>;
}
}
}

1
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/lambda/OverloadResolutionTest.java
View File

@@ -276,6 +276,7 @@ public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase {
public void testUnqualifiedStaticInterfaceMethodCallsOnInnerClasses() { doTest(false);}
public void testStaticMethodInSuperInterfaceConflictWithCurrentStatic() { doTest(false);}
public void testPreferMethodInsideSameComb() { doTest(false);}
public void testFixedContainingClassTypeArguments() { doTest(false);}
public void testPotentialCompatibilityWithArrayCreation() { doTest(false);}
public void testOverloadsWithOneNonCompatible() { doTest(false);}