[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.analysis.checkers.toRegularClassSymbol
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.fullyExpandedClass
import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder
@@ -1202,7 +1203,7 @@ internal class KtFirCallResolver(
analysisSession.useSiteSession,
analysisSession.getScopeSessionFor(analysisSession.useSiteSession),
false,
memberRequiredPhase = null,
memberRequiredPhase = FirResolvePhase.STATUS,
)
var equalsSymbol: FirNamedFunctionSymbol? = null
@@ -78,16 +78,15 @@ internal class KtFirScopeProvider(
override fun getMemberScope(classSymbol: KtSymbolWithMembers): KtScope {
val firScope = classSymbol.withFirForScope { fir ->
fir.lazyResolveToPhase(FirResolvePhase.STATUS)
val firSession = analysisSession.useSiteSession
fir.unsubstitutedScope(
firSession,
getScopeSession(),
withForcedTypeCalculator = false,
memberRequiredPhase = null,
memberRequiredPhase = FirResolvePhase.STATUS,
)
}?.applyIf(classSymbol is KtEnumEntrySymbol, ::EnumEntryContainingNamesAwareScope)
?: return getEmptyScope()
}?.applyIf(classSymbol is KtEnumEntrySymbol, ::EnumEntryContainingNamesAwareScope) ?: return getEmptyScope()
return KtFirDelegatingNamesAwareScope(firScope, builder)
}
@@ -121,7 +121,7 @@ internal class KtFirSymbolDeclarationOverridesProvider(
firSession,
analysisSession.getScopeSessionFor(firSession),
withForcedTypeCalculator = false,
memberRequiredPhase = null,
memberRequiredPhase = FirResolvePhase.STATUS,
)
firTypeScope.processCallableByName(firCallableDeclaration)