MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

shorten outer class ref in instanceof check fixed (IDEA-154823)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-04-15 20:38:30 +02:00
parent 4a148f1ceb
commit 292055d296
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java
+8
View File
@@ -265,6 +265,14 @@ public class JavaReferenceAdjuster implements ReferenceAdjuster {
if (psiReference instanceof PsiJavaCodeReferenceElement) {
PsiElement parent = psiReference.getParent();
if (parent instanceof PsiNewExpression || parent.getParent() instanceof PsiNewExpression) return true;
if (parent instanceof PsiTypeElement &&
parent.getParent() instanceof PsiInstanceOfExpression) {
final PsiClass containingClass = refClass.getContainingClass();
if (containingClass != null && containingClass.hasTypeParameters()) {
return false;
}
}
}
return helper.resolveReferencedVariable(referenceText, psiReference) == null;
}
java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ShortenClassReferencesTest.java
+17 -13
View File
@@ -73,21 +73,25 @@ public class ShortenClassReferencesTest extends LightCodeInsightFixtureTestCase
}
}
public void testOuterClassReferenceInInstanceof() throws Exception {
myFixture.configureByText("a.java", "class Outer<T> {class Inner {} {boolean b = new Inner() instanceof Outer.Inner;}}\n" +
"class Outer1 {class Inner {} {boolean b = new Inner() instanceof Outer1.Inner;}}");
doShortenRefs();
myFixture.checkResult("class Outer<T> {class Inner {} {boolean b = new Inner() instanceof Outer.Inner;}}\n" +
"class Outer1 {class Inner {} {boolean b = new Inner() instanceof Inner;}}");
}
private void doTest() {
myFixture.configureByFile(getTestName(false) + ".java");
CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
@Override
public void run() {
WriteCommandAction.runWriteCommandAction(null, new Runnable() {
@Override
public void run() {
JavaCodeStyleManager.getInstance(getProject()).shortenClassReferences(myFixture.getFile());
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
}
});
}
}, "", "");
doShortenRefs();
myFixture.checkResultByFile(getTestName(false) + "_after.java");
}
private void doShortenRefs() {
CommandProcessor.getInstance().executeCommand(getProject(), () -> WriteCommandAction.runWriteCommandAction(null, () -> {
JavaCodeStyleManager.getInstance(getProject()).shortenClassReferences(myFixture.getFile());
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
}), "", "");
}
}