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

java diamonds: avoid recursion prevention (IDEA-255486)

Browse Source 
GitOrigin-RevId: bb6e3e45899ede6c36278bfd3c74813b1fc64b38
This commit is contained in:
Anna Kozlova
2020-11-16 14:14:13 +01:00
committed by intellij-monorepo-bot
parent 860f3889a2
commit cbff44d84f
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java
View File

@@ -112,6 +112,10 @@ public final class JavaResolveUtil {
else {
contextClass = PsiTreeUtil.getContextOfType(place, PsiClass.class, false);
if (isInClassAnnotationParameterList(place, contextClass)) return false;
if (contextClass instanceof PsiAnonymousClass &&
PsiTreeUtil.isAncestor(((PsiAnonymousClass)contextClass).getArgumentList(), place, true)) {
contextClass = PsiTreeUtil.getContextOfType(contextClass, PsiClass.class, true);
}
}
return canAccessProtectedMember(member, memberClass, accessObjectClass, contextClass,
modifierList.hasModifierProperty(PsiModifier.STATIC));

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advFixture/DiamondsWithProtectedCallInConstruction.java Normal file
View File

@@ -0,0 +1,13 @@
package c;
import a.*;
class Derived extends Base {
{
Foo<String> b = new Foo<>(super.createString()) {};
}
class Foo<T> {
Foo(T t) {
}
}
}

7
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightAdvHighlightingFixtureTest.java
View File

@@ -203,6 +203,13 @@ public class LightAdvHighlightingFixtureTest extends LightJavaCodeInsightFixture
myFixture.addClass("package a; public class Base<T> { protected Base() {}}");
doTest();
}
public void testDiamondsWithProtectedCallInConstruction() {
myFixture.addClass("package a; public class Base { " +
" protected String createString() {return null;}" +
"}");
doTest();
}
private void doTest() {
myFixture.configureByFile(getTestName(false) + ".java");