[FIR] Pass proper containing classes from context to type resolution for local classes

This commit is contained in:
Dmitriy Novozhilov
2021-11-25 13:33:01 +03:00
committed by teamcityserver
parent 98934e15c0
commit 2b84e8e68f
10 changed files with 114 additions and 5 deletions
@@ -33,8 +33,17 @@ fun <F : FirClassLikeDeclaration> F.runTypeResolvePhaseForLocalClass(
session: FirSession,
scopeSession: ScopeSession,
currentScopeList: List<FirScope>,
useSiteFile: FirFile,
containingDeclarations: List<FirDeclaration>,
): F {
val transformer = FirTypeResolveTransformer(session, scopeSession, currentScopeList)
@Suppress("RemoveExplicitTypeArguments")
val transformer = FirTypeResolveTransformer(
session,
scopeSession,
currentScopeList,
initialCurrentFile = useSiteFile,
classDeclarationsStack = containingDeclarations.filterIsInstanceTo<FirClass, ArrayDeque<FirClass>>(ArrayDeque())
)
return this.transform<F, Nothing?>(transformer, null)
}
@@ -42,9 +51,10 @@ fun <F : FirClassLikeDeclaration> F.runTypeResolvePhaseForLocalClass(
open class FirTypeResolveTransformer(
final override val session: FirSession,
private val scopeSession: ScopeSession,
initialScopes: List<FirScope> = emptyList()
initialScopes: List<FirScope> = emptyList(),
initialCurrentFile: FirFile? = null,
private val classDeclarationsStack: ArrayDeque<FirClass> = ArrayDeque()
) : FirAbstractTreeTransformer<Any?>(FirResolvePhase.TYPES) {
private val classDeclarationsStack = ArrayDeque<FirClass>()
private val scopes = mutableListOf<FirScope>()
private val towerScope = scopes.asReversed()
@@ -53,7 +63,7 @@ open class FirTypeResolveTransformer(
}
private val typeResolverTransformer: FirSpecificTypeResolverTransformer = FirSpecificTypeResolverTransformer(session)
private var currentFile: FirFile? = null
private var currentFile: FirFile? = initialCurrentFile
override fun transformFile(file: FirFile, data: Any?): FirFile {
checkSessionConsistency(file)
@@ -338,6 +338,8 @@ class BodyResolveContext(
towerDataContextForAnonymousFunctions.putAll(this@BodyResolveContext.towerDataContextForAnonymousFunctions)
towerDataContextForCallableReferences.putAll(this@BodyResolveContext.towerDataContextForCallableReferences)
containers = this@BodyResolveContext.containers
containingClassDeclarations = ArrayDeque(this@BodyResolveContext.containingClassDeclarations)
containingClass = this@BodyResolveContext.containingClass
replaceTowerDataContext(this@BodyResolveContext.towerDataContext)
anonymousFunctionsAnalyzedInDependentContext.addAll(this@BodyResolveContext.anonymousFunctionsAnalyzedInDependentContext)
}
@@ -44,7 +44,9 @@ fun <F : FirClassLikeDeclaration> F.runAllPhasesForLocalClass(
runTypeResolvePhaseForLocalClass(
components.session,
components.scopeSession,
components.createCurrentScopeList()
components.createCurrentScopeList(),
components.file,
components.containingDeclarations
)
runStatusResolveForLocalClass(
components.session,