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

[AA FIR] KtFirScopeProvider: use lazy resolve only if needed

Browse Source 
^KT-56551
This commit is contained in:
Dmitrii Gridin
2023-05-15 08:47:50 +02:00
committed by Space Team
parent f2da13b39d
commit 01a94624f5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
+5 -3
View File
@@ -44,6 +44,7 @@ import org.jetbrains.kotlin.fir.scopes.*
import org.jetbrains.kotlin.fir.scopes.impl.*
import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhaseWithCallableMembers
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtElement
@@ -110,22 +111,23 @@ internal class KtFirScopeProvider(
builder
)
}
val firScope = classSymbol.withFirForScope {
when (val regularClass = classSymbol.firSymbol.fir) {
is FirJavaClass -> buildJavaEnhancementDeclaredMemberScope(useSiteSession, regularClass.symbol, getScopeSession())
else -> useSiteSession.declaredMemberScope(it)
}
} ?: return getEmptyScope()
return KtFirDelegatingNamesAwareScope(firScope, builder)
}
override fun getDelegatedMemberScope(classSymbol: KtSymbolWithMembers): KtScope {
val declaredScope = (getDeclaredMemberScope(classSymbol) as? KtFirDelegatingNamesAwareScope)?.firScope
?: return getEmptyScope()
val declaredScope = (getDeclaredMemberScope(classSymbol) as? KtFirDelegatingNamesAwareScope)?.firScope ?: return getEmptyScope()
val firScope = classSymbol.withFirForScope { fir ->
fir.lazyResolveToPhase(FirResolvePhase.STATUS)
val delegateFields = fir.delegateFields
if (delegateFields.isNotEmpty()) {
fir.lazyResolveToPhaseWithCallableMembers(FirResolvePhase.STATUS)
val firSession = analysisSession.useSiteSession
FirDelegatedMemberScope(
firSession,