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

[LL FIR] rename FirLazyDeclarationResolver -> LLFirModuleLazyDeclarationResolver

Browse Source 
to avoid naming collisions with LLFirLazyDeclarationResolver
This commit is contained in:
Ilya Kirillov
2022-08-09 14:21:32 +02:00
parent da9cf1468c
commit 1c28eef82a
11 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirLazyDeclarationResolver.kt
+1 -1
View File
@@ -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,
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirModuleResolveComponents.kt
+2 -2
View File
@@ -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,
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt
+3 -3
View File
@@ -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,
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirElementBuilder.kt
+1 -1
View File
@@ -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(),
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructure.kt
+2 -2
View File
@@ -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(),
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt
+2 -2
View File
@@ -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,
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt → analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt
+1 -3
View File
@@ -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
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt
+1 -1
View File
@@ -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,
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceResolveSession.kt
-3
View File
@@ -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
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt
+2 -2
View File
@@ -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,
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LazyTransformerFactory.kt
+2 -3
View File
@@ -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,