From 1c28eef82a2b8fef3e6c0eff3dc752b697d42bcd Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 9 Aug 2022 14:21:32 +0200 Subject: [PATCH] [LL FIR] rename FirLazyDeclarationResolver -> LLFirModuleLazyDeclarationResolver to avoid naming collisions with LLFirLazyDeclarationResolver --- .../low/level/api/fir/LLFirLazyDeclarationResolver.kt | 2 +- .../low/level/api/fir/LLFirModuleResolveComponents.kt | 4 ++-- .../api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt | 6 +++--- .../low/level/api/fir/element/builder/FirElementBuilder.kt | 2 +- .../low/level/api/fir/file/structure/FileStructure.kt | 4 ++-- .../level/api/fir/file/structure/FileStructureElement.kt | 4 ++-- ...ionResolver.kt => LLFirModuleLazyDeclarationResolver.kt} | 4 +--- .../level/api/fir/state/LLFirResolvableResolveSession.kt | 2 +- .../low/level/api/fir/state/LLFirSourceResolveSession.kt | 3 --- .../LLFirDesignatedSupertypeResolverTransformer.kt | 4 ++-- .../level/api/fir/transformers/LazyTransformerFactory.kt | 5 ++--- 11 files changed, 17 insertions(+), 23 deletions(-) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/{FirLazyDeclarationResolver.kt => LLFirModuleLazyDeclarationResolver.kt} (98%) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirLazyDeclarationResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirLazyDeclarationResolver.kt index 6158d8ffeaf..a9515a89456 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirLazyDeclarationResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirLazyDeclarationResolver.kt @@ -20,7 +20,7 @@ internal class LLFirLazyDeclarationResolver(private val sessionInvalidator: LLFi if (session !is LLFirResolvableModuleSession) return val moduleComponents = session.moduleComponents try { - moduleComponents.lazyFirDeclarationsResolver.lazyResolveDeclaration( + moduleComponents.firModuleLazyDeclarationResolver.lazyResolveDeclaration( firDeclarationToResolve = fir, scopeSession = moduleComponents.scopeSessionProvider.getScopeSession(), toPhase = toPhase, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirModuleResolveComponents.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirModuleResolveComponents.kt index cc2f14dffd3..64c2421608b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirModuleResolveComponents.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirModuleResolveComponents.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirFileBui import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCacheImpl import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.FileStructureCache -import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyDeclarationResolver +import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.LLFirModuleLazyDeclarationResolver import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirResolvableModuleSession import org.jetbrains.kotlin.analysis.low.level.api.fir.util.LLFirScopeSessionProvider import org.jetbrains.kotlin.analysis.project.structure.KtModule @@ -27,7 +27,7 @@ internal class LLFirModuleResolveComponents( ) { val cache: ModuleFileCache = ModuleFileCacheImpl(this) val firFileBuilder: LLFirFileBuilder = LLFirFileBuilder(this) - val lazyFirDeclarationsResolver = FirLazyDeclarationResolver(this) + val firModuleLazyDeclarationResolver = LLFirModuleLazyDeclarationResolver(this) val scopeSessionProvider: LLFirScopeSessionProvider = LLFirScopeSessionProvider.create( globalResolveComponents.project, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt index 0d177c7f271..a6b0f16917f 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt @@ -131,7 +131,7 @@ object LowLevelFirApiFacadeForResolveOnAir { val firFile = moduleComponents.firFileBuilder.buildRawFirFileWithCaching(file) val scopeSession = firResolveSession.getScopeSessionFor(session) - moduleComponents.lazyFirDeclarationsResolver.lazyResolveFileDeclaration( + moduleComponents.firModuleLazyDeclarationResolver.lazyResolveFileDeclaration( firFile = firFile, scopeSession = scopeSession, toPhase = FirResolvePhase.IMPORTS @@ -197,7 +197,7 @@ object LowLevelFirApiFacadeForResolveOnAir { ?: buildErrorWithAttachment("FirFile session expected to be a resolvable session but was ${firFile.llFirSession::class.java}") { withEntry("firSession", firFile.llFirSession) { it.toString() } } - val declarationResolver = llFirResolvableSession.moduleComponents.lazyFirDeclarationsResolver + val declarationResolver = llFirResolvableSession.moduleComponents.firModuleLazyDeclarationResolver declarationResolver.resolveFileAnnotations( firFile = firFile, @@ -270,7 +270,7 @@ object LowLevelFirApiFacadeForResolveOnAir { ResolveTreeBuilder.resolveEnsure(onAirDesignation.declaration, FirResolvePhase.BODY_RESOLVE) { val resolvableSession = onAirDesignation.declaration.llFirResolvableSession ?: error("Expected resolvable session") - resolvableSession.moduleComponents.lazyFirDeclarationsResolver + resolvableSession.moduleComponents.firModuleLazyDeclarationResolver .runLazyDesignatedOnAirResolveToBodyWithoutLock( designation = onAirDesignation, checkPCE = true, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirElementBuilder.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirElementBuilder.kt index 22244d1008b..5d6867be6a2 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirElementBuilder.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirElementBuilder.kt @@ -68,7 +68,7 @@ internal class FirElementBuilder( private fun getOrBuildFirForKtFile(ktFile: KtFile): FirFile { val firFile = moduleComponents.firFileBuilder.buildRawFirFileWithCaching(ktFile) - moduleComponents.lazyFirDeclarationsResolver.lazyResolveFileDeclaration( + moduleComponents.firModuleLazyDeclarationResolver.lazyResolveFileDeclaration( firFile = firFile, toPhase = FirResolvePhase.BODY_RESOLVE, scopeSession = moduleComponents.scopeSessionProvider.getScopeSession(), diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructure.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructure.kt index dd46460e3eb..a80f5361388 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructure.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructure.kt @@ -103,7 +103,7 @@ internal class FileStructure private constructor( firProvider, firFile ) - moduleComponents.lazyFirDeclarationsResolver.lazyResolveDeclaration( + moduleComponents.firModuleLazyDeclarationResolver.lazyResolveDeclaration( firDeclarationToResolve = firDeclaration, scopeSession = moduleComponents.scopeSessionProvider.getScopeSession(), toPhase = FirResolvePhase.BODY_RESOLVE, @@ -120,7 +120,7 @@ internal class FileStructure private constructor( private fun createStructureElement(container: KtAnnotated): FileStructureElement = when (container) { is KtFile -> { val firFile = moduleComponents.firFileBuilder.buildRawFirFileWithCaching(ktFile) - moduleComponents.lazyFirDeclarationsResolver.resolveFileAnnotations( + moduleComponents.firModuleLazyDeclarationResolver.resolveFileAnnotations( firFile = firFile, annotations = firFile.annotations, scopeSession = moduleComponents.scopeSessionProvider.getScopeSession(), diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt index b110922e0ca..70fd6c16606 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt @@ -125,7 +125,7 @@ internal class ReanalyzableFunctionStructureElement( it.replaceResolvePhase(minOf(it.resolvePhase, upgradedPhase)) } - moduleComponents.lazyFirDeclarationsResolver.lazyResolveDeclaration( + moduleComponents.firModuleLazyDeclarationResolver.lazyResolveDeclaration( firDeclarationToResolve = originalFunction, scopeSession = moduleComponents.scopeSessionProvider.getScopeSession(), toPhase = FirResolvePhase.BODY_RESOLVE, @@ -179,7 +179,7 @@ internal class ReanalyzablePropertyStructureElement( replaceBodyResolveState(FirPropertyBodyResolveState.NOTHING_RESOLVED) } - moduleComponents.lazyFirDeclarationsResolver.lazyResolveDeclaration( + moduleComponents.firModuleLazyDeclarationResolver.lazyResolveDeclaration( firDeclarationToResolve = originalProperty, scopeSession = moduleComponents.scopeSessionProvider.getScopeSession(), toPhase = FirResolvePhase.BODY_RESOLVE, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt similarity index 98% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt index 48061dad70b..98bdb46b2bd 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve -import com.intellij.openapi.diagnostic.ControlFlowException import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirModuleResolveComponents import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignationWithFile import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignationWithFile @@ -34,9 +33,8 @@ import org.jetbrains.kotlin.psi.KtClassBody import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtEnumEntry import org.jetbrains.kotlin.analysis.utils.errors.buildErrorWithAttachment -import org.jetbrains.kotlin.analysis.utils.errors.* -internal class FirLazyDeclarationResolver(val moduleComponents: LLFirModuleResolveComponents) { +internal class LLFirModuleLazyDeclarationResolver(val moduleComponents: LLFirModuleResolveComponents) { /** * Fully resolve file annotations (synchronized) * @see resolveFileAnnotationsWithoutLock not synchronized diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt index f44193ea143..14c4ed38c19 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt @@ -135,7 +135,7 @@ internal abstract class LLFirResolvableResolveSession( val llFirResolvableModuleSession = declaration.llFirModuleData.session as? LLFirResolvableModuleSession ?: return val moduleComponents = llFirResolvableModuleSession.moduleComponents - moduleComponents.lazyFirDeclarationsResolver.lazyResolveDeclaration( + moduleComponents.firModuleLazyDeclarationResolver.lazyResolveDeclaration( firDeclarationToResolve = declaration, scopeSession = moduleComponents.scopeSessionProvider.getScopeSession(), toPhase = toPhase, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceResolveSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceResolveSession.kt index 486d17c2f60..bd1565b7853 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceResolveSession.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceResolveSession.kt @@ -8,9 +8,6 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.state import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirGlobalResolveComponents import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter -import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.DiagnosticsCollector -import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirFileBuilder -import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyDeclarationResolver import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSessionProvider import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule import org.jetbrains.kotlin.analysis.project.structure.KtModule diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt index b47b20f8997..e4447e93bd4 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesigna import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignation import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.runCustomResolveUnderLock -import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyDeclarationResolver +import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.LLFirModuleLazyDeclarationResolver import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveTreeBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.llFirResolvableSession import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirLazyTransformer.Companion.updatePhaseDeep @@ -33,7 +33,7 @@ internal class LLFirDesignatedSupertypeResolverTransformer( private val designation: FirDeclarationDesignationWithFile, private val session: FirSession, private val scopeSession: ScopeSession, - private val firLazyDeclarationResolver: FirLazyDeclarationResolver, + private val firLazyDeclarationResolver: LLFirModuleLazyDeclarationResolver, private val lockProvider: LLFirLockProvider, private val firProviderInterceptor: FirProviderInterceptor?, private val checkPCE: Boolean, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LazyTransformerFactory.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LazyTransformerFactory.kt index 026a5f2884c..c56178095c6 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LazyTransformerFactory.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LazyTransformerFactory.kt @@ -10,15 +10,14 @@ import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.FirProviderInterceptor import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirTowerDataContextCollector import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignationWithFile -import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache -import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyDeclarationResolver +import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.LLFirModuleLazyDeclarationResolver internal object LazyTransformerFactory { fun createLazyTransformer( phase: FirResolvePhase, designation: FirDeclarationDesignationWithFile, scopeSession: ScopeSession, - lazyDeclarationResolver: FirLazyDeclarationResolver, + lazyDeclarationResolver: LLFirModuleLazyDeclarationResolver, towerDataContextCollector: FirTowerDataContextCollector?, firProviderInterceptor: FirProviderInterceptor?, checkPCE: Boolean,