MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

overload resolution: accept unqualified calls of static interface methods (IDEA-180236)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-10-09 11:43:59 +02:00
parent 60cede53c1
commit 14cb19fa39
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,7 +299,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
final PsiClass containingClass = method.getContainingClass();
if (containingClass != null && containingClass.isInterface()) {
if (qualifierClass == null) {
qualifierClass = getQualifiedClass(method);
qualifierClass = getQualifiedClass();
if (qualifierClass == null) return;
}
if (!containingClass.getManager().areElementsEquivalent(containingClass, qualifierClass)) {
@@ -310,7 +310,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
}
}
private PsiClass getQualifiedClass(PsiMethod method) {
private PsiClass getQualifiedClass() {
final PsiElement parent = myArgumentsList.getParent();
if (parent instanceof PsiMethodCallExpression) {
final PsiExpression expression = ((PsiMethodCallExpression)parent).getMethodExpression().getQualifierExpression();
@@ -320,9 +320,6 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
return (PsiClass)resolve;
}
}
else if (expression == null && !ImportsUtil.hasStaticImportOn(parent, method, true)) {
return PsiTreeUtil.getParentOfType(parent, PsiClass.class);
}
if (expression != null) {
return PsiUtil.resolveClassInType(expression.getType());

15
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/UnqualifiedStaticInterfaceMethodCallsOnInnerClasses.java Normal file
View File

@@ -0,0 +1,15 @@
interface Test {
final class Inner {
void func() {
of("");
of();
of("", "");
}
}
static void of(String... lists) { }
}

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

@@ -262,6 +262,8 @@ public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase {
public void testAdaptReturnTypesOfSiblingMethods() { doTest(false);}
public void testUnqualifiedStaticInterfaceMethodCallsOnInnerClasses() { doTest(false);}
private void doTest() {
doTest(true);
}