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

A.super.field should not accept super interface (IDEA-140646)

Browse Source
This commit is contained in:
Anna Kozlova
2015-07-07 15:51:29 +03:00
parent ea24efaba3
commit 8a9e5ae9db
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
View File

@@ -1510,9 +1510,21 @@ public class HighlightUtil extends HighlightUtilBase {
}
if (aClass == null) return null;
if (!InheritanceUtil.hasEnclosingInstanceInScope(aClass, expr, false, false) &&
!resolvesToImmediateSuperInterface(expr, qualifier, aClass, languageLevel)) {
return HighlightClassUtil.reportIllegalEnclosingUsage(expr, null, aClass, expr);
if (!InheritanceUtil.hasEnclosingInstanceInScope(aClass, expr, false, false)) {
if (!resolvesToImmediateSuperInterface(expr, qualifier, aClass, languageLevel)) {
return HighlightClassUtil.reportIllegalEnclosingUsage(expr, null, aClass, expr);
}
if (expr instanceof PsiSuperExpression) {
final PsiElement resolved = ((PsiReferenceExpression)expr.getParent()).resolve();
//15.11.2
//The form T.super.Identifier refers to the field named Identifier of the lexically enclosing instance corresponding to T,
//but with that instance viewed as an instance of the superclass of T.
if (resolved instanceof PsiField) {
String description = JavaErrorMessages.message("is.not.an.enclosing.class", formatClass(aClass));
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(expr).descriptionAndTooltip(description).create();
}
}
}
if (qualifier != null && aClass.isInterface() && languageLevel.isAtLeast(LanguageLevel.JDK_1_8)) {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/ExtensionMethods.java
View File

@@ -25,7 +25,7 @@ class C {
I.super.m();
<error descr="Unqualified super reference is not allowed in extension method">super.<error descr="Cannot resolve method 'm()'">m</error></error>();
System.out.println(I.super.i);
System.out.println(<error descr="'C.I' is not an enclosing class">I.super</error>.i);
System.out.println(<error descr="Unqualified super reference is not allowed in extension method">super.<error descr="Cannot resolve symbol 'i'">i</error></error>);
}