[AA FIR] add missing memberRequiredPhase to some usages of unsubstitutedScope

^KT-56551
This commit is contained in:
Dmitrii Gridin
2023-05-14 17:40:22 +02:00
committed by Space Team
parent fdec0bd942
commit 04231d7497
5 changed files with 11 additions and 11 deletions
@@ -40,6 +40,7 @@ import org.jetbrains.kotlin.analysis.utils.printer.parentOfType
import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirElement
import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol
import org.jetbrains.kotlin.fir.declarations.FirClass import org.jetbrains.kotlin.fir.declarations.FirClass
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter
import org.jetbrains.kotlin.fir.declarations.fullyExpandedClass import org.jetbrains.kotlin.fir.declarations.fullyExpandedClass
import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder
@@ -1202,7 +1203,7 @@ internal class KtFirCallResolver(
analysisSession.useSiteSession, analysisSession.useSiteSession,
analysisSession.getScopeSessionFor(analysisSession.useSiteSession), analysisSession.getScopeSessionFor(analysisSession.useSiteSession),
false, false,
memberRequiredPhase = null, memberRequiredPhase = FirResolvePhase.STATUS,
) )
var equalsSymbol: FirNamedFunctionSymbol? = null var equalsSymbol: FirNamedFunctionSymbol? = null
@@ -78,16 +78,15 @@ internal class KtFirScopeProvider(
override fun getMemberScope(classSymbol: KtSymbolWithMembers): KtScope { override fun getMemberScope(classSymbol: KtSymbolWithMembers): KtScope {
val firScope = classSymbol.withFirForScope { fir -> val firScope = classSymbol.withFirForScope { fir ->
fir.lazyResolveToPhase(FirResolvePhase.STATUS)
val firSession = analysisSession.useSiteSession val firSession = analysisSession.useSiteSession
fir.unsubstitutedScope( fir.unsubstitutedScope(
firSession, firSession,
getScopeSession(), getScopeSession(),
withForcedTypeCalculator = false, withForcedTypeCalculator = false,
memberRequiredPhase = null, memberRequiredPhase = FirResolvePhase.STATUS,
) )
}?.applyIf(classSymbol is KtEnumEntrySymbol, ::EnumEntryContainingNamesAwareScope) }?.applyIf(classSymbol is KtEnumEntrySymbol, ::EnumEntryContainingNamesAwareScope) ?: return getEmptyScope()
?: return getEmptyScope()
return KtFirDelegatingNamesAwareScope(firScope, builder) return KtFirDelegatingNamesAwareScope(firScope, builder)
} }
@@ -121,7 +121,7 @@ internal class KtFirSymbolDeclarationOverridesProvider(
firSession, firSession,
analysisSession.getScopeSessionFor(firSession), analysisSession.getScopeSessionFor(firSession),
withForcedTypeCalculator = false, withForcedTypeCalculator = false,
memberRequiredPhase = null, memberRequiredPhase = FirResolvePhase.STATUS,
) )
firTypeScope.processCallableByName(firCallableDeclaration) firTypeScope.processCallableByName(firCallableDeclaration)
@@ -52,7 +52,7 @@ fun FirClass.unsubstitutedScope(context: CheckerContext): FirTypeScope =
context.sessionHolder.session, context.sessionHolder.session,
context.sessionHolder.scopeSession, context.sessionHolder.scopeSession,
withForcedTypeCalculator = false, withForcedTypeCalculator = false,
memberRequiredPhase = null, memberRequiredPhase = FirResolvePhase.STATUS,
) )
fun FirClassSymbol<*>.unsubstitutedScope(context: CheckerContext): FirTypeScope = fun FirClassSymbol<*>.unsubstitutedScope(context: CheckerContext): FirTypeScope =
@@ -60,7 +60,7 @@ fun FirClassSymbol<*>.unsubstitutedScope(context: CheckerContext): FirTypeScope
context.sessionHolder.session, context.sessionHolder.session,
context.sessionHolder.scopeSession, context.sessionHolder.scopeSession,
withForcedTypeCalculator = false, withForcedTypeCalculator = false,
memberRequiredPhase = null, memberRequiredPhase = FirResolvePhase.STATUS,
) )
fun FirTypeRef.toClassLikeSymbol(session: FirSession): FirClassLikeSymbol<*>? { fun FirTypeRef.toClassLikeSymbol(session: FirSession): FirClassLikeSymbol<*>? {
@@ -247,7 +247,7 @@ object RedundantVisibilityModifierSyntaxChecker : FirDeclarationSyntaxChecker<Fi
context.sessionHolder.session, context.sessionHolder.session,
context.sessionHolder.scopeSession, context.sessionHolder.scopeSession,
withForcedTypeCalculator = false, withForcedTypeCalculator = false,
memberRequiredPhase = null, memberRequiredPhase = FirResolvePhase.STATUS,
) )
return findBiggestVisibility { checkVisibility -> return findBiggestVisibility { checkVisibility ->
@@ -266,7 +266,7 @@ object RedundantVisibilityModifierSyntaxChecker : FirDeclarationSyntaxChecker<Fi
context.sessionHolder.session, context.sessionHolder.session,
context.sessionHolder.scopeSession, context.sessionHolder.scopeSession,
withForcedTypeCalculator = false, withForcedTypeCalculator = false,
memberRequiredPhase = null, memberRequiredPhase = FirResolvePhase.STATUS,
) )
return findBiggestVisibility { return findBiggestVisibility {
@@ -282,7 +282,7 @@ object RedundantVisibilityModifierSyntaxChecker : FirDeclarationSyntaxChecker<Fi
context.sessionHolder.session, context.sessionHolder.session,
context.sessionHolder.scopeSession, context.sessionHolder.scopeSession,
withForcedTypeCalculator = false, withForcedTypeCalculator = false,
memberRequiredPhase = null, memberRequiredPhase = FirResolvePhase.STATUS,
) )
return findBiggestVisibility { return findBiggestVisibility {