From 7e453a814dedde7904bb194907400bf66f3bc641 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Mon, 5 Oct 2020 11:04:16 +0700
Subject: [PATCH] [java-completion] Use PsiManager#areElementsEquivalent

GitOrigin-RevId: b730209aa50567ebe07716af807d4a3ba585f57d
---
 .../completion/CollectionsUtilityMethodsProvider.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/CollectionsUtilityMethodsProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/CollectionsUtilityMethodsProvider.java
index da8b1fe8a64c..2924d03e90ac 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/CollectionsUtilityMethodsProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/CollectionsUtilityMethodsProvider.java
@@ -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;