MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't reject static method of interfaces imported via static imports (IDEA-145504)

Browse Source
This commit is contained in:
Anna Kozlova
2015-09-25 15:15:35 +03:00
parent 1c199f3a7b
commit 2da2ff75fa
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -374,6 +374,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
if (!(conflict instanceof MethodCandidateInfo)) continue;
final PsiMethod method = ((MethodCandidateInfo)conflict).getElement();
if (method.hasModifierProperty(PsiModifier.STATIC)) {
if (conflict.getCurrentFileResolveScope() instanceof PsiImportStaticStatement) continue;
final PsiClass containingClass = method.getContainingClass();
if (containingClass != null && containingClass.isInterface()) {
if (qualifierClass == null) {

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

@@ -0,0 +1,8 @@
import static java.util.stream.Stream.concat;
import static java.util.stream.Stream.of;
class Test {
{
concat(of(""), of(""));
}
}

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

@@ -82,6 +82,10 @@ public class Interface8MethodsHighlightingTest extends LightCodeInsightFixtureTe
doTest(true, false);
}
public void testAcceptStaticInterfaceMethodsImportedViaStaticImports() throws Exception {
doTest();
}
private void doTest() {
doTest(false, false);
}