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

optimize imports: ensure qualifiers are participating in single import vs onDemand conflict detection (IDEA-161989)

Browse Source
This commit is contained in:
Anna.Kozlova
2018-07-31 18:08:33 +02:00
parent 57e3ad1a7a
commit d206e26bb7
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
+1
View File
@@ -358,6 +358,7 @@ public class ImportHelper{
file.accept(new JavaRecursiveElementVisitor() {
@Override
public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
super.visitReferenceElement(reference);
if (reference.getQualifier() != null) return;
PsiElement element = reference.resolve();
if (element instanceof PsiClass && conflicts.contains(((PsiClass)element).getName())) {
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightOptimizeImportsTest.java
+42
View File
@@ -5,6 +5,7 @@ import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
import com.intellij.psi.codeStyle.PackageEntry;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
@SuppressWarnings("ALL")
@@ -141,4 +142,45 @@ public class LightOptimizeImportsTest extends LightCodeInsightFixtureTestCase {
" }\n" +
"}");
}
public void testConflictingSingleImportUsedInReferenceQualifier() {
myFixture.addClass("package p.p1; public class C {}");
myFixture.addClass("package p.p1; public class D {}");
myFixture.addClass("package p.p2;\n" +
"public class B{\n" +
" public enum C { None, Some, All }\n" +
" public static final int JUNK = 0;\n" +
"}");
myFixture.configureByText(StdFileTypes.JAVA, "package p.p2;\n" +
"import p.p1.*;\n" +
"import static p.p2.B.*;\n" +
"import static p.p2.B.C;\n" +
"public class A {\n" +
" public static void main( String[] args )\n" +
" {\n" +
" new D();\n" +
" System.out.println( C.None );\n" +
" System.out.println( JUNK );\n" +
" }\n" +
"}");
JavaCodeStyleSettings javaSettings = JavaCodeStyleSettings.getInstance(getProject());
javaSettings.PACKAGES_TO_USE_IMPORT_ON_DEMAND.addEntry(new PackageEntry(false, "p", true));
WriteCommandAction.runWriteCommandAction(getProject(), () -> JavaCodeStyleManager.getInstance(getProject()).optimizeImports(getFile()));
myFixture.checkResult("package p.p2;\n" +
"\n" +
"import p.p1.*;\n" +
"\n" +
"import static p.p2.B.C;\n" +
"import static p.p2.B.*;\n" +
"public class A {\n" +
" public static void main( String[] args )\n" +
" {\n" +
" new D();\n" +
" System.out.println( C.None );\n" +
" System.out.println( JUNK );\n" +
" }\n" +
"}");
}
}