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

Java: remove duplicated utility method

Browse Source 
(cherry picked from commit e539495083603140f3fd4176374ad5a0e01852c1)

GitOrigin-RevId: 612d250c0a6550e3ae733cf78f4016013b20d7b8
This commit is contained in:
Bas Leijdekkers
2024-10-17 15:58:02 +02:00
committed by intellij-monorepo-bot
parent e1b1b53039
commit 44840c3a42
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.JavaModuleGraphUtil;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaFileCodeStyleFacade;
import com.intellij.psi.search.GlobalSearchScope;
@@ -578,7 +579,7 @@ public final class ImportUtils {
if (importReference == null) continue;
String referenceName = importReference.getQualifiedName();
if (referenceName == null) continue;
myStaticImportStatements.put(staticStatement.isOnDemand() ? referenceName : getPackageOrClassName(referenceName),
myStaticImportStatements.put(staticStatement.isOnDemand() ? referenceName : StringUtil.getPackageName(referenceName),
staticStatement);
}
else if (anImport instanceof PsiImportModuleStatement moduleStatement) {
@@ -592,7 +593,7 @@ public final class ImportUtils {
}
public boolean isImplicitlyImported(String qName, boolean isStatic) {
String packageOrClassName = getPackageOrClassName(qName);
String packageOrClassName = StringUtil.getPackageName(qName);
String className = ClassUtil.extractClassName(qName);
if (!isStatic) {
for (PsiImportModuleStatement psiImportModuleStatement : myModulesStatements) {
@@ -621,11 +622,6 @@ public final class ImportUtils {
}
}
public static @NotNull String getPackageOrClassName(@NotNull String className){
int dotIndex = className.lastIndexOf('.');
return dotIndex < 0 ? "" : className.substring(0, dotIndex);
}
private static boolean memberReferenced(PsiMember member, PsiElement context) {
final MemberReferenceVisitor visitor = new MemberReferenceVisitor(member);
context.accept(visitor);