IDEA-151371 Ambiguous import of Map that is not ambiguous anymore

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java

@@ -235,12 +235,7 @@ public abstract class ImportClassFixBase<T extends PsiElement, R extends PsiRefe
   protected static List<PsiClass> filterAssignableFrom(PsiType type, List<PsiClass> candidates) {
     final PsiClass actualClass = PsiUtil.resolveClassInClassTypeOnly(type);
     if (actualClass != null) {
-      return ContainerUtil.findAll(candidates, new Condition<PsiClass>() {
-        @Override
-        public boolean value(PsiClass psiClass) {
-          return InheritanceUtil.isInheritorOrSelf(psiClass, actualClass, true);
-        }
-      });
+      return ContainerUtil.findAll(candidates, psiClass -> InheritanceUtil.isInheritorOrSelf(actualClass, psiClass, true));
     }
     return candidates;
   }

java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 package com.intellij.codeInsight.intention
+
+import com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFix
 import com.intellij.lang.java.JavaLanguage
 import com.intellij.pom.java.LanguageLevel
 import com.intellij.psi.codeStyle.CodeStyleSettings
@@ -101,6 +103,19 @@ public class Foo {
 '''
   }
 
+  public void "test use initializer"() {
+    myFixture.addClass 'package foo; public class Map {}'
+    myFixture.configureByText 'a.java', '''\
+import java.util.HashMap;
+
+public class Foo {
+    Ma<caret>p l = new HashMap<>();
+}
+'''
+    ImportClassFix intention = myFixture.findSingleIntention("Import class") as ImportClassFix
+    assert intention.classesToImport.collect { it.qualifiedName } == ['java.util.Map']
+  }
+
   public void testUseOverrideContext() {
     myFixture.addClass 'package foo; public class Log {}'
     myFixture.addClass 'package bar; public class Log {}'