azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Do not resolve import to get imported name"

Browse Source 
This reverts commit 60c3e644
This commit is contained in:
Vladimir Dolzhenko
2019-06-19 09:20:28 +02:00
parent 7040639c38
commit f11a87e0c5
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
+2 -10
View File
@@ -115,18 +115,10 @@ open class LazyImportResolver<I : KtImportInfo>(
} }
val allNames: Set<Name>? by lazy(LazyThreadSafetyMode.PUBLICATION) { val allNames: Set<Name>? by lazy(LazyThreadSafetyMode.PUBLICATION) {
indexedImports.imports.flatMapToNullable(THashSet()) { indexedImports.imports.flatMapToNullable(THashSet()) { getImportScope(it).computeImportedNames() }
if (it.isAllUnder) getImportScope(it).computeImportedNames()
else listOf(it.importedName)
}
} }
fun definitelyDoesNotContainName(name: Name): Boolean { fun definitelyDoesNotContainName(name: Name) = allNames?.let { name !in it } == true
return indexedImports.imports.find {
if (it.isAllUnder) getImportScope(it).definitelyDoesNotContainName(name) //todo: optimize...
else it.importedName == name
} != null
}
fun recordLookup(name: Name, location: LookupLocation) { fun recordLookup(name: Name, location: LookupLocation) {
if (allNames == null) return if (allNames == null) return