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

highlighting: don't check static methods for unrelated inheritance (IDEA-178539)

Browse Source 
in class case, static methods must have signatures with different erasures, for interfaces, static methods
This commit is contained in:
Anna Kozlova
2017-09-06 16:05:05 +03:00
parent 955a6160cd
commit 8032558bec
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
View File

@@ -541,7 +541,9 @@ public class GenericsHighlightUtil {
for (HierarchicalMethodSignature hms : visibleSignatures) {
final PsiMethod method = hms.getMethod();
if (method.isConstructor()) continue;
if (method.hasModifierProperty(PsiModifier.ABSTRACT) || method.hasModifierProperty(PsiModifier.DEFAULT)) continue;
if (method.hasModifierProperty(PsiModifier.ABSTRACT) ||
method.hasModifierProperty(PsiModifier.DEFAULT) ||
method.hasModifierProperty(PsiModifier.STATIC)) continue;
if (psiClass.findMethodsBySignature(method, false).length > 0) continue;
final PsiClass containingClass = method.getContainingClass();
if (containingClass == null) continue;

15
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/InterfaceStaticMethodsWithSameErasure.java Normal file
View File

@@ -0,0 +1,15 @@
import java.util.List;
class InterfaceStaticMethodsWithSameErasure {
interface A<I, R> {
static <I, R> A<I, R> foo(List<I> a) { return null; }
}
interface B<I, R> extends A<I, R> {
static <I, R> B<I, R> foo(List<R> b) { return null; }
}
static abstract class C<I, R> implements B<I, R> { }
static class D<I, R> extends C<I, R> { }
}

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

@@ -42,6 +42,7 @@ public class Interface8MethodsHighlightingTest extends LightCodeInsightFixtureTe
public void testStaticMethods() { doTest(false, false); }
public void testFinalStaticDefaultMethods() { doTest(false, false); }
public void testIDEA122720() { doTest(false, false); }
public void testInterfaceStaticMethodsWithSameErasure() { doTest(false, false); }
public void testIDEA123839() { doTest(false, false); }
public void testStaticOverloading() { doTest(false, false); }
public void testDefaultSupersInStaticContext() {