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

check extends/implements list for nested classes of super type (IDEA-108287)

Browse Source
This commit is contained in:
Anna Kozlova
2013-06-03 22:23:20 +04:00
parent 7db41b19b5
commit 91779d0c81
4 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1261,5 +1261,27 @@ public class GenericsHighlightUtil {
}
return null;
}
public static HighlightInfo checkCannotPassInner(PsiJavaCodeReferenceElement ref) {
if (ref.getParent() instanceof PsiTypeElement) {
final PsiClass psiClass = PsiTreeUtil.getParentOfType(ref, PsiClass.class);
if (psiClass != null) {
if (PsiTreeUtil.isAncestor(psiClass.getExtendsList(), ref, false) ||
PsiTreeUtil.isAncestor(psiClass.getImplementsList(), ref, false)) {
final PsiElement qualifier = ref.getQualifier();
if (qualifier instanceof PsiJavaCodeReferenceElement && ((PsiJavaCodeReferenceElement)qualifier).resolve() == psiClass) {
final PsiElement resolve = ref.resolve();
if (resolve instanceof PsiClass) {
final PsiClass containingClass = ((PsiClass)resolve).getContainingClass();
if (containingClass != null && psiClass.isInheritor(containingClass, true)) {
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).descriptionAndTooltip(((PsiClass)resolve).getName() + " is not accessible in current context").range(ref).create();
}
}
}
}
}
}
return null;
}
}

1
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
View File

@@ -929,6 +929,7 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
if (!myHolder.hasErrorResults()) myHolder.add(GenericsHighlightUtil.checkSelectStaticClassFromParameterizedType(resolved, ref));
if (!myHolder.hasErrorResults()) myHolder.add(GenericsHighlightUtil.checkParameterizedReferenceTypeArguments(resolved, ref,
result.getSubstitutor()));
if (!myHolder.hasErrorResults()) myHolder.add(GenericsHighlightUtil.checkCannotPassInner(ref));
if (resolved != null && parent instanceof PsiReferenceList) {
if (!myHolder.hasErrorResults()) myHolder.add(HighlightUtil.checkElementInReferenceList(ref, (PsiReferenceList)parent, result));

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA108287.java Normal file
View File

@@ -0,0 +1,9 @@
class Foo<T> {
static class Nested {};
}
class Bar extends Foo<<error descr="Nested is not accessible in current context">Bar.Nested</error>> {}
interface FooI<T> {
interface Nested {};
}
interface BarI extends FooI<<error descr="Nested is not accessible in current context">BarI.Nested</error>> {}

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

@@ -257,6 +257,10 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false);
}
public void testIDEA108287() throws Exception {
doTest5(false);
}
public void testDisableCastingToNestedWildcards() throws Exception {
doTest5(false);
}