From 04231d74972919d630df2609377dd0c8fcebe636 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Sun, 14 May 2023 17:40:22 +0200 Subject: [PATCH] [AA FIR] add missing memberRequiredPhase to some usages of unsubstitutedScope ^KT-56551 --- .../analysis/api/fir/components/KtFirCallResolver.kt | 3 ++- .../analysis/api/fir/components/KtFirScopeProvider.kt | 7 +++---- .../components/KtFirSymbolDeclarationOverridesProvider.kt | 2 +- .../jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt | 4 ++-- .../extended/RedundantVisibilityModifierSyntaxChecker.kt | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt index c1e6d1abe5e..cfbcfc5f65e 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt @@ -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 diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt index ab3812841c8..1056a0e652f 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt @@ -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) } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt index 9a6f1f8d6e9..6f72be2337c 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt @@ -121,7 +121,7 @@ internal class KtFirSymbolDeclarationOverridesProvider( firSession, analysisSession.getScopeSessionFor(firSession), withForcedTypeCalculator = false, - memberRequiredPhase = null, + memberRequiredPhase = FirResolvePhase.STATUS, ) firTypeScope.processCallableByName(firCallableDeclaration) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt index 0cde61c1324..c815eaa5e6d 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt @@ -52,7 +52,7 @@ fun FirClass.unsubstitutedScope(context: CheckerContext): FirTypeScope = context.sessionHolder.session, context.sessionHolder.scopeSession, withForcedTypeCalculator = false, - memberRequiredPhase = null, + memberRequiredPhase = FirResolvePhase.STATUS, ) fun FirClassSymbol<*>.unsubstitutedScope(context: CheckerContext): FirTypeScope = @@ -60,7 +60,7 @@ fun FirClassSymbol<*>.unsubstitutedScope(context: CheckerContext): FirTypeScope context.sessionHolder.session, context.sessionHolder.scopeSession, withForcedTypeCalculator = false, - memberRequiredPhase = null, + memberRequiredPhase = FirResolvePhase.STATUS, ) fun FirTypeRef.toClassLikeSymbol(session: FirSession): FirClassLikeSymbol<*>? { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantVisibilityModifierSyntaxChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantVisibilityModifierSyntaxChecker.kt index 05d6d40c0f5..adb200968c4 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantVisibilityModifierSyntaxChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantVisibilityModifierSyntaxChecker.kt @@ -247,7 +247,7 @@ object RedundantVisibilityModifierSyntaxChecker : FirDeclarationSyntaxChecker @@ -266,7 +266,7 @@ object RedundantVisibilityModifierSyntaxChecker : FirDeclarationSyntaxChecker