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

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

Browse Source 
^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
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt
+2 -1
View File
@@ -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
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
+3 -4
View File
@@ -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)
}
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt
+1 -1
View File
@@ -121,7 +121,7 @@ internal class KtFirSymbolDeclarationOverridesProvider(
firSession,
analysisSession.getScopeSessionFor(firSession),
withForcedTypeCalculator = false,
memberRequiredPhase = null,
memberRequiredPhase = FirResolvePhase.STATUS,
)
firTypeScope.processCallableByName(firCallableDeclaration)
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
+2 -2
View File
@@ -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<*>? {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantVisibilityModifierSyntaxChecker.kt
+3 -3
View File
@@ -247,7 +247,7 @@ object RedundantVisibilityModifierSyntaxChecker : FirDeclarationSyntaxChecker<Fi
context.sessionHolder.session,
context.sessionHolder.scopeSession,
withForcedTypeCalculator = false,
memberRequiredPhase = null,
memberRequiredPhase = FirResolvePhase.STATUS,
)
return findBiggestVisibility { checkVisibility ->
@@ -266,7 +266,7 @@ object RedundantVisibilityModifierSyntaxChecker : FirDeclarationSyntaxChecker<Fi
context.sessionHolder.session,
context.sessionHolder.scopeSession,
withForcedTypeCalculator = false,
memberRequiredPhase = null,
memberRequiredPhase = FirResolvePhase.STATUS,
)
return findBiggestVisibility {
@@ -282,7 +282,7 @@ object RedundantVisibilityModifierSyntaxChecker : FirDeclarationSyntaxChecker<Fi
context.sessionHolder.session,
context.sessionHolder.scopeSession,
withForcedTypeCalculator = false,
memberRequiredPhase = null,
memberRequiredPhase = FirResolvePhase.STATUS,
)
return findBiggestVisibility {