MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-05 08:06:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-inspections] IDEA-357190 Support JEP477 - Remove unnecessary qualification is not suggested when it can be

Browse Source 
- check if class is already imported

GitOrigin-RevId: 11a43bf80302194a4f8b34125de2bb741f1f3bac
This commit is contained in:
Mikhail Pyltsin
2024-08-08 18:26:48 +02:00
committed by intellij-monorepo-bot
parent d3c5f5a6c0
commit 0f5aa949cb
5 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
java/java-analysis-impl/src/com/siyeh/ig/psiutils/ImportUtils.java
View File

@@ -130,7 +130,8 @@ public final class ImportUtils {
if (hasExactImportConflict(fqName, file)) {
return false;
}
if (hasOnDemandImportConflict(fqName, file, true)) {
if (hasOnDemandImportConflict(fqName, file, true) && !isAlreadyImported(file, fqName)
) {
return false;
}
if (containsConflictingReference(file, fqName)) {
@@ -142,6 +143,34 @@ public final class ImportUtils {
return !containsConflictingTypeParameter(fqName, context);
}
/**
* 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 fullyQualifiedName the fully qualified name of the class to check.
* @return true if the class is already imported, false otherwise.
*/
public static boolean isAlreadyImported(@NotNull PsiJavaFile file, @NotNull String fullyQualifiedName) {
String className = extractClassName(file, fullyQualifiedName);
Project project = file.getProject();
PsiResolveHelper resolveHelper = PsiResolveHelper.getInstance(project);
PsiClass psiClass = resolveHelper.resolveReferencedClass(className, file);
return psiClass != null && fullyQualifiedName.equals(psiClass.getQualifiedName());
}
private static @NotNull String extractClassName(@NotNull PsiJavaFile file, @NotNull String fullyQualifiedName) {
for (PsiClass aClass : file.getClasses()) {
String outerClassName = aClass.getQualifiedName();
if (outerClassName != null && fullyQualifiedName.startsWith(outerClassName)) {
return fullyQualifiedName.substring(outerClassName.lastIndexOf('.') + 1);
}
}
return ClassUtil.extractClassName(fullyQualifiedName);
}
private static boolean containsConflictingTypeParameter(String fqName, PsiElement context) {
final String shortName = ClassUtil.extractClassName(fqName);
PsiElement parent = context.getParent();