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

cleanup

Browse Source 
GitOrigin-RevId: fc34d05b947fc47549aae445f30eebc680b52165
This commit is contained in:
Alexey Kudravtsev
2023-11-08 14:55:29 +00:00
committed by intellij-monorepo-bot
parent 3599ba73e0
commit a273cc34c0
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/unusedImport/ImportsAreUsedVisitor.java
+11 -11
View File
@@ -32,7 +32,7 @@ class ImportsAreUsedVisitor extends JavaRecursiveElementWalkingVisitor {
private final List<PsiImportStatementBase> importStatements;
private final List<PsiImportStatementBase> usedImportStatements = new ArrayList<>();
ImportsAreUsedVisitor(PsiJavaFile file) {
ImportsAreUsedVisitor(@NotNull PsiJavaFile file) {
myFile = file;
final PsiImportList importList = file.getImportList();
if (importList == null) {
@@ -91,25 +91,25 @@ class ImportsAreUsedVisitor extends JavaRecursiveElementWalkingVisitor {
}
}
private PsiImportStatementBase findImport(PsiMember member, List<? extends PsiImportStatementBase> importStatements) {
final String qualifiedName;
final String packageName;
private PsiImportStatementBase findImport(@NotNull PsiMember member, List<? extends PsiImportStatementBase> importStatements) {
final String memberQualifiedName;
final String memberPackageName;
final PsiClass containingClass = member.getContainingClass();
if (member instanceof PsiClass referencedClass) {
qualifiedName = referencedClass.getQualifiedName();
packageName = qualifiedName != null ? StringUtil.getPackageName(qualifiedName) : null;
memberQualifiedName = referencedClass.getQualifiedName();
memberPackageName = memberQualifiedName != null ? StringUtil.getPackageName(memberQualifiedName) : null;
}
else {
if (!member.hasModifierProperty(PsiModifier.STATIC) || containingClass == null) {
return null;
}
packageName = containingClass.getQualifiedName();
qualifiedName = packageName + '.' + member.getName();
memberPackageName = containingClass.getQualifiedName();
memberQualifiedName = memberPackageName + '.' + member.getName();
}
if (packageName == null) {
if (memberPackageName == null) {
return null;
}
final boolean hasOnDemandImportConflict = ImportUtils.hasOnDemandImportConflict(qualifiedName, myFile);
final boolean hasOnDemandImportConflict = ImportUtils.hasOnDemandImportConflict(memberQualifiedName, myFile);
for (PsiImportStatementBase importStatement : importStatements) {
if (!importStatement.isOnDemand()) {
final PsiJavaCodeReferenceElement reference = importStatement.getImportReference();
@@ -129,7 +129,7 @@ class ImportsAreUsedVisitor extends JavaRecursiveElementWalkingVisitor {
}
final PsiElement target = importStatement.resolve();
if (target instanceof PsiPackage aPackage) {
if (packageName.equals(aPackage.getQualifiedName())) {
if (memberPackageName.equals(aPackage.getQualifiedName())) {
return importStatement;
}
}
java/java-analysis-impl/src/com/intellij/codeInspection/unusedImport/UnusedImportInspection.java
+1
View File
@@ -62,6 +62,7 @@ public class UnusedImportInspection extends GlobalSimpleInspectionTool {
return false;
}
@NotNull
public static @Nls String getDisplayNameText() {
return JavaAnalysisBundle.message("unused.import.display.name");
}
platform/core-api/src/com/intellij/lang/Language.java
+1 -1
View File
@@ -44,7 +44,7 @@ public abstract class Language extends UserDataHolderBase {
public static final Language[] EMPTY_ARRAY = new Language[0];
private static final Object staticLock = new Object();
private static volatile PersistentMap<Class<? extends Language>, Language> registeredLanguages = persistentHashMapOf();
private static volatile PersistentMap<Class<? extends Language>, @NotNull Language> registeredLanguages = persistentHashMapOf();
private static volatile PersistentMap<String, PersistentList<Language>> registeredMimeTypes = persistentHashMapOf();
private static volatile PersistentMap<String, Language> registeredIds = persistentHashMapOf();