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

[AA FIR] KtFirMemberSymbolPointer: replace explicit lazy resolve call with implicit

Browse Source 
^KT-56551
This commit is contained in:
Dmitrii Gridin
2023-05-14 17:55:50 +02:00
committed by Space Team
parent 04231d7497
commit f2da13b39d
1 changed files with 1 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/symbols/pointers/KtFirMemberSymbolPointer.kt
+1 -3
View File
@@ -18,7 +18,6 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
internal abstract class KtFirMemberSymbolPointer<S : KtSymbol>( internal abstract class KtFirMemberSymbolPointer<S : KtSymbol>(
private val ownerPointer: KtSymbolPointer<KtSymbolWithMembers>, private val ownerPointer: KtSymbolPointer<KtSymbolWithMembers>,
@@ -30,7 +29,6 @@ internal abstract class KtFirMemberSymbolPointer<S : KtSymbol>(
val scope = with(analysisSession) { val scope = with(analysisSession) {
val ownerSymbol = ownerPointer.restoreSymbol() ?: return null val ownerSymbol = ownerPointer.restoreSymbol() ?: return null
val owner = ownerSymbol.firSymbol as? FirClassSymbol ?: return null val owner = ownerSymbol.firSymbol as? FirClassSymbol ?: return null
owner.lazyResolveToPhase(FirResolvePhase.STATUS)
getSearchScope(owner) getSearchScope(owner)
} ?: return null } ?: return null
@@ -51,7 +49,7 @@ internal abstract class KtFirMemberSymbolPointer<S : KtSymbol>(
useSiteSession = firSession, useSiteSession = firSession,
scopeSession = scopeSession, scopeSession = scopeSession,
withForcedTypeCalculator = false, withForcedTypeCalculator = false,
memberRequiredPhase = null, memberRequiredPhase = FirResolvePhase.STATUS,
) )
} }
} }