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

Refactor FirSelfImportingScope

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-11 15:13:13 +03:00
committed by Mikhail Glukhikh
parent f22cca5087
commit a5ca8ffe69
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirSelfImportingScope.kt
+4 -12
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir.scopes.impl package org.jetbrains.kotlin.fir.scopes.impl
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider
import org.jetbrains.kotlin.fir.scopes.FirPosition import org.jetbrains.kotlin.fir.scopes.FirPosition
@@ -19,26 +18,19 @@ class FirSelfImportingScope(val fqName: FqName, val session: FirSession) : FirSc
private val symbolProvider = FirSymbolProvider.getInstance(session) private val symbolProvider = FirSymbolProvider.getInstance(session)
private val cache = ContainerUtil.newConcurrentMap<Name, ConeClassifierSymbol>() private val cache = mutableMapOf<Name, ConeClassifierSymbol?>()
private val absentKeys = ContainerUtil.newConcurrentSet<Name>()
override fun processClassifiersByName( override fun processClassifiersByName(
name: Name, name: Name,
position: FirPosition, position: FirPosition,
processor: (ConeClassifierSymbol) -> Boolean processor: (ConeClassifierSymbol) -> Boolean
): Boolean { ): Boolean {
if (name.asString().isEmpty()) return true
if (name in absentKeys) return true val symbol = cache.getOrPut(name) {
val symbol = cache[name] ?: run {
val unambiguousFqName = ClassId(fqName, name) val unambiguousFqName = ClassId(fqName, name)
val computed = symbolProvider.getClassLikeSymbolByFqName(unambiguousFqName) symbolProvider.getClassLikeSymbolByFqName(unambiguousFqName)
if (computed == null) {
absentKeys += name
} else {
cache[name] = computed
}
computed
} }
return if (symbol != null) { return if (symbol != null) {