From f11a87e0c50ec8dd7daee0b262c328d4d2ad6590 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Wed, 19 Jun 2019 09:20:28 +0200
Subject: [PATCH] Revert "Do not resolve import to get imported name"

This reverts commit 60c3e644
---
 .../jetbrains/kotlin/resolve/lazy/LazyImportScope.kt | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
index 4f3b5fc6c98..0fa3fa0937c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
@@ -115,18 +115,10 @@ open class LazyImportResolver<I : KtImportInfo>(
     }
 
     val allNames: Set<Name>? by lazy(LazyThreadSafetyMode.PUBLICATION) {
-        indexedImports.imports.flatMapToNullable(THashSet()) {
-            if (it.isAllUnder) getImportScope(it).computeImportedNames()
-            else listOf(it.importedName)
-        }
+        indexedImports.imports.flatMapToNullable(THashSet()) { getImportScope(it).computeImportedNames() }
     }
 
-    fun definitelyDoesNotContainName(name: Name): Boolean {
-        return indexedImports.imports.find {
-            if (it.isAllUnder) getImportScope(it).definitelyDoesNotContainName(name) //todo: optimize...
-            else it.importedName == name
-        } != null
-    }
+    fun definitelyDoesNotContainName(name: Name) = allNames?.let { name !in it } == true
 
     fun recordLookup(name: Name, location: LookupLocation) {
         if (allNames == null) return