[java-completion] Use PsiManager#areElementsEquivalent

GitOrigin-RevId: b730209aa50567ebe07716af807d4a3ba585f57d
This commit is contained in:
Tagir Valeev
2020-10-06 08:04:22 +00:00
committed by intellij-monorepo-bot
parent 92081c3ba3
commit 7e453a814d
@@ -33,16 +33,16 @@ class CollectionsUtilityMethodsProvider {
final PsiElement parent = myElement.getParent();
if (parent instanceof PsiReferenceExpression && ((PsiReferenceExpression)parent).getQualifierExpression() != null) return;
final PsiClass collectionsClass =
JavaPsiFacade.getInstance(myElement.getProject()).findClass(JAVA_UTIL_COLLECTIONS, myElement.getResolveScope());
if (collectionsClass == null) return;
PsiJavaFile file = ObjectUtils.tryCast(parent.getContainingFile(), PsiJavaFile.class);
if (file == null) return;
final PsiClass collectionsClass =
JavaPsiFacade.getInstance(file.getProject()).findClass(JAVA_UTIL_COLLECTIONS, file.getResolveScope());
if (collectionsClass == null) return;
PsiImportList importList = file.getImportList();
if (importList != null) {
for (PsiImportStaticStatement statement : importList.getImportStaticStatements()) {
PsiClass aClass = statement.resolveTargetClass();
if (aClass != null && aClass.isEquivalentTo(collectionsClass)) {
if (aClass != null && file.getManager().areElementsEquivalent(aClass, collectionsClass)) {
// The Collections class is already statically imported;
// should be suggested anyway in JavaStaticMemberProcessor
return;