MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJ-CR-151305 [java-import] IDEA-364508 support optimize imports

Browse Source 
- fix comparator

(cherry picked from commit 5c6f0a4e689359a5574578cd63377543d413ccda)

GitOrigin-RevId: 5cc96fa8dc448e65fa2d58d5692f8af27e9ddd3c
This commit is contained in:
Mikhail Pyltsin
2024-12-20 18:49:17 +01:00
committed by intellij-monorepo-bot
parent 105b965377
commit e6ec1394ca
4 changed files with 92 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
View File

@@ -64,7 +64,7 @@ public final class ImportHelper {
/**
* @deprecated Use {@link #ImportHelper(JavaCodeStyleSettings)} instead. The instance of JavaCodeStyleSettings
* can be obtained using {@link JavaCodeStyleSettings#getInstance(PsiFile)} method.
* can be obtained using {@link JavaCodeStyleSettings#getInstance(PsiFile)} method.
*/
@Deprecated(forRemoval = true)
public ImportHelper(@NotNull CodeStyleSettings settings) {
@@ -162,15 +162,15 @@ public final class ImportHelper {
/**
* Collects the names of classes that are imported by modules specified implicitly in the given Java file and in import list.
*
* @param file the Java file for which imported class names are being collected.
* @param file the Java file for which imported class names are being collected.
* @param statements a list of import module statements that specify the modules from which classes are imported.
* @param list a list of import objects representing the imports from which class names need to be collected.
* @param list a list of import objects representing the imports from which class names need to be collected.
* @return a map of class names and used module imports.
*/
@NotNull
private static Map<String, PsiImportModuleStatement> collectNamesImportedByModules(@NotNull PsiJavaFile file,
@NotNull List<PsiImportModuleStatement> statements,
@NotNull List<Import> list) {
@NotNull List<PsiImportModuleStatement> statements,
@NotNull List<Import> list) {
List<PsiImportStatementBase> implicitImports = ImportsUtil.getAllImplicitImports(file);
List<PsiImportModuleStatement> moduleImports =
new ArrayList<>(ContainerUtil.filterIsInstance(implicitImports, PsiImportModuleStatement.class));
@@ -200,7 +200,7 @@ public final class ImportHelper {
/**
* Collects the module import statements from the specified Java file, considering the code style settings, to insert in the new import list
*
* @param file the Java file from which module import statements are collected.
* @param file the Java file from which module import statements are collected.
* @param settings the code style settings that determine whether module imports should be preserved.
* @return a list of module import statements present in the Java file.
*/
@@ -217,7 +217,7 @@ public final class ImportHelper {
@NotNull Map<String, Boolean> outClassesOrPackagesToImportOnDemand,
@NotNull Map<String, PsiImportModuleStatement> moduleStatementMap) {
Object2IntMap<String> packageToCountMap = new Object2IntOpenHashMap<>();
Object2IntMap <String> classToCountMap = new Object2IntOpenHashMap<>();
Object2IntMap<String> classToCountMap = new Object2IntOpenHashMap<>();
for (Import anImport : resultList) {
if (!anImport.isStatic() && moduleStatementMap.containsKey(anImport.name)) continue;
String packageOrClassName = StringUtil.getPackageName(anImport.name());
@@ -238,7 +238,8 @@ public final class ImportHelper {
});
}
private record SortedImportItems(@NotNull List<Import> imports, int moduleIndex) { }
private record SortedImportItems(@NotNull List<Import> imports, int moduleIndex) {
}
public static @NotNull List<Import> sortItemsAccordingToSettings(@NotNull List<Import> imports,
@NotNull JavaCodeStyleSettings settings) {
@@ -345,8 +346,12 @@ public final class ImportHelper {
return namesToUseSingle;
}
private static boolean checkMemberAccessibility(@NotNull PsiMember member, @NotNull PsiResolveHelper resolveHelper, @NotNull PsiFile psiFile,
@NotNull PsiClass aClass, @NotNull @NlsSafe String prefix) {
private static boolean checkMemberAccessibility(@NotNull PsiMember member,
@NotNull PsiResolveHelper resolveHelper,
@NotNull PsiFile psiFile,
@NotNull PsiClass aClass,
@NotNull @NlsSafe String prefix) {
if (member.hasModifierProperty(PsiModifier.STATIC) && resolveHelper.isAccessible(member, psiFile, null)) {
PsiClass containingClass = member.getContainingClass();
if (containingClass == null) return false;
@@ -505,22 +510,27 @@ public final class ImportHelper {
appendImportStatement(name, isStatic, buffer);
}
}
else if (!implicitlyImported && !importedPackagesOrClasses.contains(packageOrClassName) && !moduleStatementMap.containsKey(name)) {
appendImportStatement(name, isStatic, buffer);
}
else if (!implicitlyImported && !importedPackagesOrClasses.contains(packageOrClassName) && moduleStatementMap.containsKey(name)) {
usedModuleImports.add(moduleStatementMap.get(name));
else if (!implicitlyImported && !importedPackagesOrClasses.contains(packageOrClassName)) {
if (!moduleStatementMap.containsKey(name)) {
appendImportStatement(name, isStatic, buffer);
}
else {
usedModuleImports.add(moduleStatementMap.get(name));
}
}
}
StringBuilder moduleStatements = new StringBuilder();
for (String importModuleStatement : usedModuleImports.stream()
.map(m->m.getText())
.sorted(Comparator.naturalOrder())
.toList()) {
moduleStatements.append(importModuleStatement).append("\n");
}
usedModuleImports.stream()
.sorted(Comparator.comparing(m -> {
PsiJavaModuleReferenceElement reference = m.getModuleReference();
if (reference == null) return "";
return reference.getText();
}))
.map(m -> m.getText())
.forEach(importModuleStatement -> {
moduleStatements.append(importModuleStatement).append("\n");
});
if (!moduleStatements.isEmpty()) {
if (indexModuleString != -1) {
buffer.insert(indexModuleString, moduleStatements);
@@ -541,6 +551,7 @@ public final class ImportHelper {
/**
* Adds import if it is needed.
*
* @return false when the FQN has to be used in code (e.g. when conflicting imports already exist)
*/
public boolean addImport(@NotNull PsiJavaFile file, @NotNull PsiClass refClass) {
@@ -624,7 +635,8 @@ public final class ImportHelper {
try {
PsiImportList importList = file.getImportList();
assert importList != null : file;
PsiImportStatement statement = useOnDemand ? factory.createImportStatementOnDemand(packageName) : factory.createImportStatement(refClass);
PsiImportStatement statement =
useOnDemand ? factory.createImportStatementOnDemand(packageName) : factory.createImportStatement(refClass);
importList.add(statement);
if (useOnDemand) {
for (PsiJavaCodeReferenceElement ref : importRefs) {
@@ -829,7 +841,7 @@ public final class ImportHelper {
/**
* Checks if the class with the given fully qualified name is already imported in the specified Java file.
*
* @param file the Java file to check for the import.
* @param file the Java file to check for the import.
* @param fullyQualifiedName the fully qualified name of the class to check.
* @return true if the class is already imported, false otherwise.
*/
@@ -978,7 +990,9 @@ public final class ImportHelper {
mySettings.IMPORT_LAYOUT_TABLE.getEntries());
}
public static boolean hasConflictingOnStaticDemandImport(@NotNull PsiJavaFile file, @NotNull PsiClass psiClass, @NotNull String referenceName) {
public static boolean hasConflictingOnStaticDemandImport(@NotNull PsiJavaFile file,
@NotNull PsiClass psiClass,
@NotNull String referenceName) {
Collection<Import> resultList = collectNamesToImport(file, new ArrayList<>());
String qualifiedName = psiClass.getQualifiedName();
for (Import anImport : resultList) {
@@ -1222,5 +1236,6 @@ public final class ImportHelper {
* @param isStatic whether it should be imported statically.
*/
@ApiStatus.Internal
public record Import(@NotNull String name, boolean isStatic) {}
public record Import(@NotNull String name, boolean isStatic) {
}
}

7
java/java-tests/testData/importModule/resolve/OptimizeImportWithSimilarNames.java Normal file
View File

@@ -0,0 +1,7 @@
import module my.source.moduleB1;
import module my.source.moduleB;
class OptimizeImportWithSimilarNames {
Imported1 module1;
Imported2 <caret>module2;
}

7
java/java-tests/testData/importModule/resolve/OptimizeImportWithSimilarNames_after.java Normal file
View File

@@ -0,0 +1,7 @@
import module my.source.moduleB;
import module my.source.moduleB1;
class OptimizeImportWithSimilarNames {
Imported1 module1;
Imported2 <caret>module2;
}

37
java/java-tests/testSrc/com/intellij/java/psi/resolve/ResolveModuleImportTest.java
View File

@@ -381,6 +381,43 @@ public class ResolveModuleImportTest extends LightJava9ModulesCodeInsightFixture
});
}
public void testOptimizeImportWithSimilarNames() {
addCode("module-info.java", """
module my.source.moduleB {
exports my.source.moduleB;
}
""", M2);
addCode("my/source/moduleB/Imported1.java", """
package my.source.moduleB;
public class Imported1 {}
""", M2);
addCode("module-info.java", """
module my.source.moduleB1 {
exports my.source.moduleB1;
}
""", M4);
addCode("my/source/moduleB1/Imported2.java", """
package my.source.moduleB1;
public class Imported2 {}
""", M4);
WriteCommandAction.runWriteCommandAction(getProject(), () -> {
String fileName = getTestName(false) + ".java";
try {
PsiFile file = myFixture.configureByFile(fileName);
JavaCodeStyleManager.getInstance(getProject()).optimizeImports(file);
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
myFixture.checkResultByFile(getTestName(false) + "_after" + ".java");
PsiTestUtil.checkFileStructure(file);
}
catch (Exception e) {
LOG.error(e);
}
});
}
private void prepareAmbiguousModuleTests() {
addCode("module-info.java", """
module my.source.moduleB {