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: fix order of on demand imports in presence of single import statements from same package (IDEA-163103)

Browse Source
This commit is contained in:
Anna.Kozlova
2018-07-27 18:48:57 +02:00
parent 61333fe0e5
commit b57645dc99
2 changed files with 52 additions and 1 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
+5 -1
View File
@@ -381,10 +381,14 @@ public class ImportHelper{
String packageOrClassName = getPackageOrClassName(name);
final boolean implicitlyImported = JAVA_LANG_PACKAGE.equals(packageOrClassName);
boolean useOnDemand = implicitlyImported || packagesOrClassesToImportOnDemand.contains(packageOrClassName);
final Pair<String, Boolean> current = Pair.create(packageOrClassName, isStatic);
if (namesToUseSingle.remove(name)) {
if (useOnDemand && importedPackagesOrClasses.contains(current)) {
buffer.insert(buffer.lastIndexOf("import"), "import " + (isStatic ? "static " : "") + name + ";\n");
continue;
}
useOnDemand = false;
}
final Pair<String, Boolean> current = Pair.create(packageOrClassName, isStatic);
if (useOnDemand && (importedPackagesOrClasses.contains(current) || implicitlyImported)) continue;
buffer.append("import ");
if (isStatic) buffer.append("static ");
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightOptimizeImportsTest.java
+47
View File
@@ -7,6 +7,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
@SuppressWarnings("ALL")
public class LightOptimizeImportsTest extends LightCodeInsightFixtureTestCase {
public void testSingleImportConflictingWith2Others() throws Exception {
@@ -50,4 +51,50 @@ public class LightOptimizeImportsTest extends LightCodeInsightFixtureTestCase {
" };\n" +
"}\n");
}
public void testStaticImportsOrder() throws Exception {
myFixture.addClass("package p; public class C1 {" +
" public static String Byte;\n" +
" public static String Field2;" +
"}");
myFixture.addClass("package p; public class C2 { " +
" public static String Long;\n" +
" public static String Field4;" +
"}");
myFixture.configureByText(StdFileTypes.JAVA, "\n" +
"import static p.C1.*;\n" +
"import static p.C1.Byte;\n" +
"import static p.C2.Long;\n" +
"import static p.C2.*;\n" +
"\n" +
"public class Main {\n" +
" public static void main(String[] args) {\n" +
" System.out.println(Byte);\n" +
" System.out.println(Field2);\n" +
" System.out.println(Long);\n" +
" System.out.println(Field4);\n" +
" }\n" +
"}");
JavaCodeStyleSettings javaSettings = JavaCodeStyleSettings.getInstance(getProject());
javaSettings.NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND = 1;
WriteCommandAction.runWriteCommandAction(getProject(), () -> JavaCodeStyleManager.getInstance(getProject()).optimizeImports(getFile()));
myFixture.checkResult("import static p.C1.Byte;\n" +
"import static p.C1.*;\n" +
"import static p.C2.Long;\n" +
"import static p.C2.*;\n" +
"\n" +
"public class Main {\n" +
" public static void main(String[] args) {\n" +
" System.out.println(Byte);\n" +
" System.out.println(Field2);\n" +
" System.out.println(Long);\n" +
" System.out.println(Field4);\n" +
" }\n" +
"}");
}
}