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

FIR IDE: make KtFirDelegatingScope caching a thread safe

Browse Source
This commit is contained in:
Ilya Kirillov
2020-07-10 15:02:25 +03:00
parent ebf20c9706
commit 4653cdf794
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirDelegatingScope.kt
+4 -8
View File
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
import org.jetbrains.kotlin.fir.symbols.PossiblyFirFakeOverrideSymbol import org.jetbrains.kotlin.fir.symbols.PossiblyFirFakeOverrideSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached
import org.jetbrains.kotlin.idea.frontend.api.scopes.KtScope import org.jetbrains.kotlin.idea.frontend.api.scopes.KtScope
import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol
import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassLikeSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassLikeSymbol
@@ -22,17 +23,12 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
import org.jetbrains.kotlin.idea.frontend.api.withValidityAssertion import org.jetbrains.kotlin.idea.frontend.api.withValidityAssertion
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
internal abstract class KtFirDelegatingScope(private val builder: KtSymbolByFirBuilder) : KtScope { internal abstract class KtFirDelegatingScope(private val builder: KtSymbolByFirBuilder) : KtScope, ValidityOwnerByValidityToken {
abstract val firScope: FirScope abstract val firScope: FirScope
private var allNamesCached: Set<Name>? = null private val allNamesCached by cached { getCallableNames() + getClassLikeSymbolNames() }
override fun getAllNames(): Set<Name> = withValidityAssertion { override fun getAllNames(): Set<Name> = allNamesCached
if (allNamesCached == null) {
allNamesCached = getCallableNames() + getClassLikeSymbolNames()
}
allNamesCached!!
}
override fun getCallableNames(): Set<Name> = withValidityAssertion { override fun getCallableNames(): Set<Name> = withValidityAssertion {
firScope.getCallableNames() firScope.getCallableNames()