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

static interface method call: ignore static imports if call is qualified (IDEA-136077)

Browse Source
This commit is contained in:
Anna Kozlova
2015-02-11 12:17:10 +01:00
parent 5da386943e
commit 502dd423d9
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodCandidatesProcessor.java
View File

@@ -65,7 +65,10 @@ public class MethodCandidatesProcessor extends MethodsProcessor{
}
private boolean isInterfaceStaticMethodAccessibleThroughInheritance(PsiMethod method) {
if (method.hasModifierProperty(PsiModifier.STATIC) && !(myCurrentFileContext instanceof PsiImportStaticStatement)) {
if (method.hasModifierProperty(PsiModifier.STATIC) &&
!(myCurrentFileContext instanceof PsiImportStaticStatement) &&
myPlace instanceof PsiMethodCallExpression &&
((PsiMethodCallExpression)myPlace).getMethodExpression().getQualifierExpression() == null) {
final PsiClass containingClass = method.getContainingClass();
return containingClass != null && containingClass.isInterface();
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/StaticMethodAccessibleThroughStaticImportButExplicitlyQualified.java Normal file
View File

@@ -0,0 +1,8 @@
import java.util.function.Function;
import static java.util.function.Function.identity;
class FunctionExample {
public static void main(String [] args) throws Exception {
Function f = Function.identity();
}
}

4
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Interface8MethodsHighlightingTest.java
View File

@@ -47,6 +47,10 @@ public class Interface8MethodsHighlightingTest extends LightCodeInsightFixtureTe
doTest(false, false);
}
public void testStaticMethodAccessibleThroughStaticImportButExplicitlyQualified() throws Exception {
doTest(true, false);
}
public void testStaticMethodAccessibleBothThroughStaticImportAndInheritance() throws Exception {
myFixture.addClass("package p; public interface Foo {" +
" static void foo() {}" +