From 6e999f6e842c021496cc7c2858992c2089e1412d Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 31 Jan 2022 16:26:11 +0100 Subject: [PATCH] LL API: refactoring: replace FirIDE prefixes with LLFir prefixes --- ...deDeserializedDeclarationSourceProvider.kt | 6 +- .../analysis/api/fir/KtFirAnalysisSession.kt | 6 +- .../api/fir/KtFirAnalysisSessionProvider.kt | 10 +-- .../analysis/api/fir/KtSymbolByFirBuilder.kt | 8 +-- .../fir/components/KtFirImportOptimizer.kt | 4 +- .../fir/components/KtFirReferenceShortener.kt | 8 +-- .../api/fir/components/KtFirScopeProvider.kt | 4 +- .../symbols/KtFirAnonymousFunctionSymbol.kt | 4 +- .../fir/symbols/KtFirAnonymousObjectSymbol.kt | 4 +- .../fir/symbols/KtFirBackingFieldSymbol.kt | 4 +- .../symbols/KtFirClassInitializerSymbol.kt | 4 +- .../api/fir/symbols/KtFirConstructorSymbol.kt | 4 +- .../api/fir/symbols/KtFirEnumEntrySymbol.kt | 4 +- .../api/fir/symbols/KtFirFileSymbol.kt | 4 +- .../api/fir/symbols/KtFirFunctionSymbol.kt | 4 +- .../api/fir/symbols/KtFirJavaFieldSymbol.kt | 4 +- .../fir/symbols/KtFirKotlinPropertySymbol.kt | 4 +- .../fir/symbols/KtFirLocalVariableSymbol.kt | 4 +- .../symbols/KtFirNamedClassOrObjectSymbol.kt | 4 +- .../fir/symbols/KtFirPropertyGetterSymbol.kt | 4 +- .../fir/symbols/KtFirPropertySetterSymbol.kt | 4 +- .../symbols/KtFirReceiverParameterSymbol.kt | 5 +- .../fir/symbols/KtFirSamConstructorSymbol.kt | 4 +- .../analysis/api/fir/symbols/KtFirSymbol.kt | 4 +- .../api/fir/symbols/KtFirSymbolProvider.kt | 4 +- .../KtFirSyntheticJavaPropertySymbol.kt | 4 +- .../api/fir/symbols/KtFirTypeAliasSymbol.kt | 4 +- .../fir/symbols/KtFirTypeParameterSymbol.kt | 4 +- .../fir/symbols/KtFirValueParameterSymbol.kt | 19 +----- .../KtAnalysisSessionFe10BindingHolder.kt | 6 +- .../api/fir/FirIdeResolveStateService.kt | 34 +++++----- .../api/fir/FirModuleResolveStateDepended.kt | 6 +- ...irPhaseManager.kt => LLFirPhaseManager.kt} | 7 +- ...{FirPhaseRunner.kt => LLFirPhaseRunner.kt} | 2 +- ...lveState.kt => LLFirModuleResolveState.kt} | 2 +- .../level/api/fir/api/LowLevelFirApiFacade.kt | 30 ++++---- .../LowLevelFirApiFacadeForResolveOnAir.kt | 10 +-- .../AbstractFirIdeDiagnosticsCollector.kt | 2 +- ...FileStructureElementDiagnosticRetriever.kt | 4 +- ...ileStructureElementDiagnosticsCollector.kt | 6 +- .../diagnostics/FirIdeDiagnosticReporter.kt | 2 +- .../diagnostics/FirIdeDiagnosticVisitor.kt | 2 +- ...IdeStructureElementDiagnosticsCollector.kt | 6 +- .../fir/PersistentCheckerContextFactory.kt | 4 +- .../fir/element/builder/FirElementBuilder.kt | 6 +- ...solveTransformerForReturnTypeCalculator.kt | 6 +- ...BasedTransformerForReturnTypeCalculator.kt | 6 +- .../api/fir/file/builder/FirFileBuilder.kt | 4 +- .../LLFirLibraryResolveModuleFileCache.kt | 4 +- .../api/fir/file/structure/FileStructure.kt | 2 +- .../fir/file/structure/FileStructureCache.kt | 2 +- .../file/structure/FileStructureElement.kt | 8 +-- .../resolve/FirLazyDeclarationResolver.kt | 8 +-- .../providers/FirIdeBuiltinSymbolProvider.kt | 2 +- ...rIdeBuiltinsAndCloneableSessionProvider.kt | 4 +- .../FirIdeLibrariesSessionProvider.kt | 4 +- .../level/api/fir/providers/FirIdeProvider.kt | 4 +- .../LLFirLibraryResolvableProvider.kt | 2 +- ...irModuleWithDependenciesSymbolProvider.kt} | 12 ++-- ...oviderHelper.kt => LLFirProviderHelper.kt} | 2 +- .../api/fir/sessions/FirIdeLibrarySession.kt | 5 +- .../api/fir/sessions/FirIdeSessionFactory.kt | 68 +++++++++---------- .../api/fir/sessions/FirIdeSessionProvider.kt | 14 ++-- .../sessions/FirIdeSessionProviderStorage.kt | 20 +++--- ...kt => LLFirBuiltinsAndCloneableSession.kt} | 4 +- .../sessions/LLFirResolvableModuleSession.kt | 6 +- .../{FirIdeSession.kt => LLFirSession.kt} | 5 +- ...alidator.kt => LLFirSessionInvalidator.kt} | 2 +- ...urcesSession.kt => LLFirSourcesSession.kt} | 2 +- .../level/api/fir/sessions/LibrariesCache.kt | 7 +- ...brarySourceResolvableModuleResolveState.kt | 4 +- .../LLFirResolvableModuleResolveState.kt | 16 ++--- ...te.kt => LLFirSourceModuleResolveState.kt} | 6 +- .../state/TowerProviderForElementForState.kt | 21 +++--- ...rmer.kt => LLFirDeclarationTransformer.kt} | 2 +- ...dAnnotationArgumentsResolveTransformer.kt} | 10 +-- ... LLFirDesignatedBodyResolveTransformer.kt} | 16 ++--- ...rDesignatedContractsResolveTransformer.kt} | 12 ++-- ...LFirDesignatedImplicitTypesTransformer.kt} | 16 ++--- ...LFirDesignatedStatusResolveTransformer.kt} | 12 ++-- ...DesignatedSupertypeResolverTransformer.kt} | 14 ++-- ...LLFirDesignatedTypeResolverTransformer.kt} | 12 ++-- ...LLFirFileAnnotationsResolveTransformer.kt} | 12 ++-- ...rIDE.kt => LLFirFirProviderInterceptor.kt} | 4 +- ...ormerForIDE.kt => LLFirLazyTransformer.kt} | 11 ++- .../transformers/LazyTransformerFactory.kt | 18 ++--- .../AbstractFirLazyDeclarationResolveTest.kt | 6 +- .../api/fir/AbstractFirOnAirResolveTest.kt | 4 +- .../based/AbstractCompilerBasedTestForFir.kt | 9 ++- .../based/LowLevelFirAnalyzerFacade.kt | 4 +- .../api/fir/compiler/based/testServices.kt | 4 +- .../AbstractFirContextCollectionTest.kt | 4 +- .../structure/AbstractFileStructureTest.kt | 4 +- .../low/level/api/fir/firTestUtils.kt | 8 +-- 94 files changed, 346 insertions(+), 365 deletions(-) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/{IdeFirPhaseManager.kt => LLFirPhaseManager.kt} (89%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/{FirPhaseRunner.kt => LLFirPhaseRunner.kt} (96%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/{FirModuleResolveState.kt => LLFirModuleResolveState.kt} (98%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/{FirModuleWithDependenciesSymbolProvider.kt => LLFirModuleWithDependenciesSymbolProvider.kt} (92%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/{FirProviderHelper.kt => LLFirProviderHelper.kt} (99%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/{FirIdeBuiltinsAndCloneableSession.kt => LLFirBuiltinsAndCloneableSession.kt} (80%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/{FirIdeSession.kt => LLFirSession.kt} (70%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/{FirSessionInvalidator.kt => LLFirSessionInvalidator.kt} (79%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/{FirIdeSourcesSession.kt => LLFirSourcesSession.kt} (91%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/{FirSourceModuleResolveState.kt => LLFirSourceModuleResolveState.kt} (95%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{IDEDeclarationTransformer.kt => LLFirDeclarationTransformer.kt} (96%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{FirDesignatedAnnotationArgumentsResolveTransformerForIDE.kt => LLFirDesignatedAnnotationArgumentsResolveTransformer.kt} (89%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{FirDesignatedBodyResolveTransformerForIDE.kt => LLFirDesignatedBodyResolveTransformer.kt} (88%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{FirDesignatedContractsResolveTransformerForIDE.kt => LLFirDesignatedContractsResolveTransformer.kt} (89%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{FirDesignatedImplicitTypesTransformerForIDE.kt => LLFirDesignatedImplicitTypesTransformer.kt} (88%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{FirDesignatedStatusResolveTransformerForIDE.kt => LLFirDesignatedStatusResolveTransformer.kt} (91%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{FirDesignatedSupertypeResolverTransformerForIDE.kt => LLFirDesignatedSupertypeResolverTransformer.kt} (94%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{FirDesignatedTypeResolverTransformerForIDE.kt => LLFirDesignatedTypeResolverTransformer.kt} (90%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{FirFileAnnotationsResolveTransformer.kt => LLFirFileAnnotationsResolveTransformer.kt} (86%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{FirProviderInterceptorForIDE.kt => LLFirFirProviderInterceptor.kt} (91%) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/{FirLazyTransformerForIDE.kt => LLFirLazyTransformer.kt} (86%) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/FirIdeDeserializedDeclarationSourceProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/FirIdeDeserializedDeclarationSourceProvider.kt index bea4928d0f8..7825eec4913 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/FirIdeDeserializedDeclarationSourceProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/FirIdeDeserializedDeclarationSourceProvider.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.KtFakeSourceElement import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtRealPsiSourceElement import org.jetbrains.kotlin.analysis.low.level.api.fir.api.KtDeclarationAndFirDeclarationEqualityChecker -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession +import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession import org.jetbrains.kotlin.analysis.providers.createDeclarationProvider import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* @@ -163,7 +163,7 @@ fun FirBasedSymbol<*>.findPsi(): PsiElement? = fir.findPsi(fir.moduleData.session) fun FirElement.findPsi(session: FirSession): PsiElement? = - findPsi((session as FirIdeSession).project) + findPsi((session as LLFirSession).project) /** * Finds [PsiElement] which will be used as go-to referenced element for [KtPsiReference] @@ -171,4 +171,4 @@ fun FirElement.findPsi(session: FirSession): PsiElement? = * Otherwise, behaves the same way as [findPsi] returns exact PSI declaration corresponding to passed [FirDeclaration] */ fun FirDeclaration.findReferencePsi(): PsiElement? = - psi ?: FirIdeDeserializedDeclarationSourceProvider.findPsi(this, (moduleData.session as FirIdeSession).project) + psi ?: FirIdeDeserializedDeclarationSourceProvider.findPsi(this, (moduleData.session as LLFirSession).project) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt index 4a85573de4b..8603a725869 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirOverrideInfoProvider import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirSymbolProvider import org.jetbrains.kotlin.analysis.api.fir.utils.threadLocal import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LowLevelFirApiFacadeForResolveOnAir import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.moduleData @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.KtFile internal class KtFirAnalysisSession private constructor( private val project: Project, - val firResolveState: FirModuleResolveState, + val firResolveState: LLFirModuleResolveState, internal val firSymbolBuilder: KtSymbolByFirBuilder, token: ValidityToken, private val mode: AnalysisSessionMode, @@ -119,7 +119,7 @@ private constructor( companion object { @InvalidWayOfUsingAnalysisSession internal fun createAnalysisSessionByResolveState( - firResolveState: FirModuleResolveState, + firResolveState: LLFirModuleResolveState, token: ValidityToken, ): KtFirAnalysisSession { val project = firResolveState.project diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSessionProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSessionProvider.kt index 706c02f86cc..2efcc43d38a 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSessionProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSessionProvider.kt @@ -13,17 +13,17 @@ import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirSymbol import org.jetbrains.kotlin.analysis.api.impl.base.CachingKtAnalysisSessionProvider import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getResolveState import org.jetbrains.kotlin.psi.KtElement @OptIn(InvalidWayOfUsingAnalysisSession::class) -class KtFirAnalysisSessionProvider(project: Project) : CachingKtAnalysisSessionProvider(project) { - override fun getResolveState(contextElement: KtElement): FirModuleResolveState { +class KtFirAnalysisSessionProvider(project: Project) : CachingKtAnalysisSessionProvider(project) { + override fun getResolveState(contextElement: KtElement): LLFirModuleResolveState { return contextElement.getResolveState() } - override fun getResolveState(contextSymbol: KtSymbol): FirModuleResolveState { + override fun getResolveState(contextSymbol: KtSymbol): LLFirModuleResolveState { return when (contextSymbol) { is KtFirSymbol<*> -> contextSymbol.resolveState is KtFirBackingFieldSymbol -> contextSymbol.resolveState @@ -32,7 +32,7 @@ class KtFirAnalysisSessionProvider(project: Project) : CachingKtAnalysisSessionP } override fun createAnalysisSession( - resolveState: FirModuleResolveState, + resolveState: LLFirModuleResolveState, validityToken: ValidityToken, ): KtAnalysisSession { @Suppress("DEPRECATION") diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtSymbolByFirBuilder.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtSymbolByFirBuilder.kt index 3f97f8e6e6e..840a0893c88 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtSymbolByFirBuilder.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtSymbolByFirBuilder.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.providers.createPackageProvider import org.jetbrains.kotlin.builtins.functions.FunctionClassKind import org.jetbrains.kotlin.fir.* @@ -53,7 +53,7 @@ import kotlin.contracts.contract */ internal class KtSymbolByFirBuilder private constructor( private val project: Project, - resolveState: FirModuleResolveState, + resolveState: LLFirModuleResolveState, override val token: ValidityToken, val withReadOnlyCaching: Boolean, private val symbolsCache: BuilderCache, KtSymbol>, @@ -74,7 +74,7 @@ internal class KtSymbolByFirBuilder private constructor( val typeBuilder = TypeBuilder() constructor( - resolveState: FirModuleResolveState, + resolveState: LLFirModuleResolveState, project: Project, token: ValidityToken ) : this( @@ -88,7 +88,7 @@ internal class KtSymbolByFirBuilder private constructor( filesCache = BuilderCache(), ) - fun createReadOnlyCopy(newResolveState: FirModuleResolveState): KtSymbolByFirBuilder { + fun createReadOnlyCopy(newResolveState: LLFirModuleResolveState): KtSymbolByFirBuilder { check(!withReadOnlyCaching) { "Cannot create readOnly KtSymbolByFirBuilder from a readonly one" } return KtSymbolByFirBuilder( project, diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirImportOptimizer.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirImportOptimizer.kt index f1206bd3f11..2bd3d0914ca 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirImportOptimizer.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirImportOptimizer.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.api.components.KtImportOptimizerResult import org.jetbrains.kotlin.analysis.api.fir.getCandidateSymbols import org.jetbrains.kotlin.analysis.api.fir.utils.computeImportableName import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions internal class KtFirImportOptimizer( override val token: ValidityToken, - private val firResolveState: FirModuleResolveState + private val firResolveState: LLFirModuleResolveState ) : KtImportOptimizer() { private val firSession: FirSession get() = firResolveState.rootModuleSession diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt index 5d95ca2297e..f77bab8eaa3 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.analysis.api.impl.barebone.parentsOfType import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtClassLikeSymbol import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LowLevelFirApiFacadeForResolveOnAir import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFir import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirOfType @@ -64,7 +64,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull internal class KtFirReferenceShortener( override val analysisSession: KtFirAnalysisSession, override val token: ValidityToken, - override val firResolveState: FirModuleResolveState, + override val firResolveState: LLFirModuleResolveState, ) : KtReferenceShortener(), KtFirAnalysisSessionComponent { private val context = FirShorteningContext(firResolveState) @@ -163,7 +163,7 @@ private data class AvailableSymbol( val importKind: ImportKind, ) -private class FirShorteningContext(val firResolveState: FirModuleResolveState) { +private class FirShorteningContext(val firResolveState: LLFirModuleResolveState) { private val firSession: FirSession get() = firResolveState.rootModuleSession @@ -281,7 +281,7 @@ private class ElementsToShortenCollector( private val selection: TextRange, private val classShortenOption: (FirClassLikeSymbol<*>) -> ShortenOption, private val callableShortenOption: (FirCallableSymbol<*>) -> ShortenOption, - private val firResolveState: FirModuleResolveState, + private val firResolveState: LLFirModuleResolveState, ) : FirVisitorVoid() { val namesToImport: MutableList = mutableListOf() 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 ca5be97e633..a83cc103fc8 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 @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithMembers import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.util.getElementTextInContext import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirClass @@ -50,7 +50,7 @@ internal class KtFirScopeProvider( analysisSession: KtFirAnalysisSession, builder: KtSymbolByFirBuilder, private val project: Project, - firResolveState: FirModuleResolveState, + firResolveState: LLFirModuleResolveState, override val token: ValidityToken, ) : KtScopeProvider(), ValidityTokenOwner { override val analysisSession: KtFirAnalysisSession by weakRef(analysisSession) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt index 43aab813013..a56230c4398 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt @@ -16,14 +16,14 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.resolve.getHasStableParameterNames import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.isExtension internal class KtFirAnonymousFunctionSymbol( override val firSymbol: FirAnonymousFunctionSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder, ) : KtAnonymousFunctionSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousObjectSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousObjectSymbol.kt index ac03b51ec1c..947a0aeb557 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousObjectSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirAnonymousObjectSymbol.kt @@ -16,12 +16,12 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointe import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol internal class KtFirAnonymousObjectSymbol( override val firSymbol: FirAnonymousObjectSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder, ) : KtAnonymousObjectSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirBackingFieldSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirBackingFieldSymbol.kt index 7a83c72b088..899e2f9e905 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirBackingFieldSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirBackingFieldSymbol.kt @@ -14,12 +14,12 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol internal class KtFirBackingFieldSymbol( override val firSymbol: FirBackingFieldSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtBackingFieldSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirClassInitializerSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirClassInitializerSymbol.kt index 934f11a2ccb..8c715192b05 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirClassInitializerSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirClassInitializerSymbol.kt @@ -13,12 +13,12 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousInitializerSymbol internal class KtFirClassInitializerSymbol( override val firSymbol: FirAnonymousInitializerSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, ) : KtClassInitializerSymbol(), KtFirSymbol { override val psi: PsiElement? by cached { firSymbol.findPsi() } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirConstructorSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirConstructorSymbol.kt index f9cad035c80..88fdda80e7d 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirConstructorSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirConstructorSymbol.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.containingClass import org.jetbrains.kotlin.fir.declarations.utils.visibility @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.name.ClassId internal class KtFirConstructorSymbol( override val firSymbol: FirConstructorSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtConstructorSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirEnumEntrySymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirEnumEntrySymbol.kt index 0c44d4abe83..5a3cc829ddb 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirEnumEntrySymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirEnumEntrySymbol.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.containingClass import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol import org.jetbrains.kotlin.name.CallableId @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.name.Name internal class KtFirEnumEntrySymbol( override val firSymbol: FirEnumEntrySymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtEnumEntrySymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFileSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFileSymbol.kt index aca59286bf4..bf47de31943 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFileSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFileSymbol.kt @@ -14,12 +14,12 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithDeclaration import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol internal class KtFirFileSymbol( override val firSymbol: FirFileSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, ) : KtFileSymbol(), KtSymbolWithDeclarations, KtFirSymbol { override val psi: PsiElement? by cached { firSymbol.findPsi() } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt index 09d82b94f67..b313d2f6f2e 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.WrongSymbolForSamConst import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.containingClass @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.name.Name internal class KtFirFunctionSymbol( override val firSymbol: FirNamedFunctionSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtFunctionSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirJavaFieldSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirJavaFieldSymbol.kt index 0cc2a6f4b88..1a3efca6229 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirJavaFieldSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirJavaFieldSymbol.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.containingClass @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.name.Name internal class KtFirJavaFieldSymbol( override val firSymbol: FirFieldSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtJavaFieldSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt index 649af173efb..d93ae76a9f4 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.WrongSymbolForSamConst import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.containingClass @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.name.Name internal class KtFirKotlinPropertySymbol( override val firSymbol: FirPropertySymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtKotlinPropertySymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirLocalVariableSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirLocalVariableSymbol.kt index 5cb16db5525..57c6e7d2683 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirLocalVariableSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirLocalVariableSymbol.kt @@ -17,13 +17,13 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.name.Name internal class KtFirLocalVariableSymbol( override val firSymbol: FirPropertySymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtLocalVariableSymbol(), diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt index 8a1747496ca..7158344122d 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.Name internal class KtFirNamedClassOrObjectSymbol( override val firSymbol: FirRegularClassSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtNamedClassOrObjectSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt index 5688d64aca4..84c81e263ce 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.name.CallableId internal class KtFirPropertyGetterSymbol( override val firSymbol: FirPropertyAccessorSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder, ) : KtPropertyGetterSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt index 61b1dda8154..43d2b8bc074 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.name.CallableId internal class KtFirPropertySetterSymbol( override val firSymbol: FirPropertyAccessorSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder, ) : KtPropertySetterSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirReceiverParameterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirReceiverParameterSymbol.kt index b7b28325fb4..70f9b7ef493 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirReceiverParameterSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirReceiverParameterSymbol.kt @@ -17,13 +17,12 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState -import org.jetbrains.kotlin.fir.originalOrSelf +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol internal class KtFirReceiverParameterSymbol( val firSymbol: FirCallableSymbol<*>, - val resolveState: FirModuleResolveState, + val resolveState: LLFirModuleResolveState, override val token: ValidityToken, _builder: KtSymbolByFirBuilder ) : KtReceiverParameterSymbol(), ValidityTokenOwner { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt index bd9a1bbb953..0582e756095 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.resolve.getHasStableParameterNames import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.isExtension @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.Name internal class KtFirSamConstructorSymbol( override val firSymbol: FirNamedFunctionSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtSamConstructorSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt index 0e10dd320b1..5f174ca60be 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol internal interface KtFirSymbol> : KtSymbol, ValidityTokenOwner { val firSymbol: S - abstract val resolveState: FirModuleResolveState + abstract val resolveState: LLFirModuleResolveState override val origin: KtSymbolOrigin get() = firSymbol.fir.ktSymbolOrigin() } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbolProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbolProvider.kt index 0fc4607de6d..ade62957011 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbolProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbolProvider.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirOfType import org.jetbrains.kotlin.analysis.low.level.api.fir.api.resolveToFirSymbolOfType @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.* internal class KtFirSymbolProvider( override val analysisSession: KtAnalysisSession, firSymbolProvider: FirSymbolProvider, - private val resolveState: FirModuleResolveState, + private val resolveState: LLFirModuleResolveState, private val firSymbolBuilder: KtSymbolByFirBuilder, override val token: ValidityToken, ) : KtSymbolProvider(), ValidityTokenOwner { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt index c8287defde7..d99b5c0556a 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.containingClass @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.Name internal class KtFirSyntheticJavaPropertySymbol( override val firSymbol: FirSyntheticPropertySymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtSyntheticJavaPropertySymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAliasSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAliasSymbol.kt index e16d9890710..8d152e1c5ab 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAliasSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAliasSymbol.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.declarations.utils.visibility @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.name.Name internal class KtFirTypeAliasSymbol( override val firSymbol: FirTypeAliasSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder, ) : KtTypeAliasSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeParameterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeParameterSymbol.kt index d064dc0d908..88d8837ba10 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeParameterSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeParameterSymbol.kt @@ -15,14 +15,14 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance internal class KtFirTypeParameterSymbol( override val firSymbol: FirTypeParameterSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtTypeParameterSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt index 4102ebc1e21..658a0064e18 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt @@ -15,30 +15,15 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointe import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.withValidityAssertion -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirOfType -import org.jetbrains.kotlin.builtins.StandardNames -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.getAnnotationsByClassId -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirConstExpression -import org.jetbrains.kotlin.fir.expressions.unwrapArgument -import org.jetbrains.kotlin.fir.psi +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.renderWithType -import org.jetbrains.kotlin.fir.symbols.ensureResolved import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol import org.jetbrains.kotlin.fir.types.arrayElementType -import org.jetbrains.kotlin.fir.types.customAnnotations import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.psi.KtDeclaration -import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.kotlin.utils.addToStdlib.safeAs internal class KtFirValueParameterSymbol( override val firSymbol: FirValueParameterSymbol, - override val resolveState: FirModuleResolveState, + override val resolveState: LLFirModuleResolveState, override val token: ValidityToken, private val builder: KtSymbolByFirBuilder ) : KtValueParameterSymbol(), KtFirSymbol { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/KtAnalysisSessionFe10BindingHolder.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/KtAnalysisSessionFe10BindingHolder.kt index a067c231217..f659121da3d 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/KtAnalysisSessionFe10BindingHolder.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/KtAnalysisSessionFe10BindingHolder.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtClassLikeSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclaration @@ -29,7 +29,7 @@ class KtAnalysisSessionFe10BindingHolder private constructor( ) { val analysisSession: KtAnalysisSession get() = firAnalysisSession - val firResolveState: FirModuleResolveState get() = firAnalysisSession.firResolveState + val firResolveState: LLFirModuleResolveState get() = firAnalysisSession.firResolveState fun buildClassLikeSymbol(fir: FirClassLikeDeclaration): KtClassLikeSymbol = firAnalysisSession.firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(fir.symbol) @@ -47,7 +47,7 @@ class KtAnalysisSessionFe10BindingHolder private constructor( companion object { @InvalidWayOfUsingAnalysisSession - fun create(firResolveState: FirModuleResolveState, token: ValidityToken, @Suppress("UNUSED_PARAMETER") ktElement: KtElement): KtAnalysisSessionFe10BindingHolder { + fun create(firResolveState: LLFirModuleResolveState, token: ValidityToken, @Suppress("UNUSED_PARAMETER") ktElement: KtElement): KtAnalysisSessionFe10BindingHolder { @Suppress("DEPRECATION") val firAnalysisSession = KtFirAnalysisSession.createAnalysisSessionByResolveState(firResolveState, token) return KtAnalysisSessionFe10BindingHolder(firAnalysisSession) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirIdeResolveStateService.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirIdeResolveStateService.kt index 2c172e4e721..7f7126921e8 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirIdeResolveStateService.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirIdeResolveStateService.kt @@ -9,13 +9,13 @@ import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.project.Project import com.intellij.openapi.roots.ProjectRootModificationTracker import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyDeclarationResolver -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSessionProviderStorage -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSourcesSession +import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession +import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSessionProviderStorage +import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSourcesSession import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirLibraryOrLibrarySourceResolvableModuleSession -import org.jetbrains.kotlin.analysis.low.level.api.fir.state.FirSourceModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.state.LLFirSourceModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.state.LLFirLibraryOrLibrarySourceResolvableModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.state.LLFirResolvableModuleResolveState import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.analysis.providers.createProjectWideOutOfBlockModifi import org.jetbrains.kotlin.analysis.utils.caches.strongCachedValue import java.util.concurrent.ConcurrentHashMap -internal class FirIdeResolveStateService(project: Project) { - private val sessionProviderStorage = FirIdeSessionProviderStorage(project) +internal class LLFirResolveStateService(project: Project) { + private val sessionProviderStorage = LLFirSessionProviderStorage(project) private val stateCache by strongCachedValue( project.createProjectWideOutOfBlockModificationTracker(), @@ -40,19 +40,19 @@ internal class FirIdeResolveStateService(project: Project) { stateCache.computeIfAbsent(module) { createResolveStateFor(module, sessionProviderStorage) } companion object { - fun getInstance(project: Project): FirIdeResolveStateService = - ServiceManager.getService(project, FirIdeResolveStateService::class.java) + fun getInstance(project: Project): LLFirResolveStateService = + ServiceManager.getService(project, LLFirResolveStateService::class.java) internal fun createResolveStateFor( module: KtModule, - sessionProviderStorage: FirIdeSessionProviderStorage, - configureSession: (FirIdeSession.() -> Unit)? = null, + sessionProviderStorage: LLFirSessionProviderStorage, + configureSession: (LLFirSession.() -> Unit)? = null, ): LLFirResolvableModuleResolveState { val sessionProvider = sessionProviderStorage.getSessionProvider(module, configureSession) return when (module) { is KtSourceModule -> { - val firFileBuilder = (sessionProvider.rootModuleSession as FirIdeSourcesSession).firFileBuilder - FirSourceModuleResolveState( + val firFileBuilder = (sessionProvider.rootModuleSession as LLFirSourcesSession).firFileBuilder + LLFirSourceModuleResolveState( sessionProviderStorage.project, module, sessionProvider, @@ -83,11 +83,11 @@ internal class FirIdeResolveStateService(project: Project) { fun createResolveStateForNoCaching( module: KtModule, project: Project, - configureSession: (FirIdeSession.() -> Unit)? = null, -): FirModuleResolveState = - FirIdeResolveStateService.createResolveStateFor( + configureSession: (LLFirSession.() -> Unit)? = null, +): LLFirModuleResolveState = + LLFirResolveStateService.createResolveStateFor( module = module, - sessionProviderStorage = FirIdeSessionProviderStorage(project), + sessionProviderStorage = LLFirSessionProviderStorage(project), configureSession = configureSession ) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateDepended.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateDepended.kt index db344295e84..0d82db6a547 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateDepended.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateDepended.kt @@ -7,12 +7,11 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FirElementBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FirTowerContextProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.KtToFirMapping -import org.jetbrains.kotlin.analysis.low.level.api.fir.state.FirSourceModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.state.LLFirResolvableModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.state.TowerProviderForElementForState import org.jetbrains.kotlin.analysis.low.level.api.fir.util.containingKtFileIfAny @@ -28,13 +27,12 @@ import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.psi.KtLambdaExpression internal class FirModuleResolveStateDepended( val originalState: LLFirResolvableModuleResolveState, val towerProviderBuiltUponElement: FirTowerContextProvider, private val ktToFirMapping: KtToFirMapping?, -) : FirModuleResolveState() { +) : LLFirModuleResolveState() { override val project: Project get() = originalState.project override val module: KtModule get() = originalState.module override val rootModuleSession get() = originalState.rootModuleSession diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/IdeFirPhaseManager.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirPhaseManager.kt similarity index 89% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/IdeFirPhaseManager.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirPhaseManager.kt index 251d1d522ea..2d4348c14dd 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/IdeFirPhaseManager.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirPhaseManager.kt @@ -6,20 +6,19 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir import org.jetbrains.kotlin.fir.ThreadSafeMutableState -import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.symbols.FirPhaseManager import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol 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.sessions.FirSessionInvalidator +import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSessionInvalidator @ThreadSafeMutableState -internal class IdeFirPhaseManager( +internal class LLFirPhaseManager( private val lazyDeclarationResolver: FirLazyDeclarationResolver, private val cache: ModuleFileCache, - private val sessionInvalidator: FirSessionInvalidator, + private val sessionInvalidator: LLFirSessionInvalidator, ) : FirPhaseManager() { override fun ensureResolved( symbol: FirBasedSymbol<*>, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirPhaseRunner.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirPhaseRunner.kt similarity index 96% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirPhaseRunner.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirPhaseRunner.kt index cd7db911b41..d2ff33a482e 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirPhaseRunner.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirPhaseRunner.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.analysis.low.level.api.fir.util.executeWithoutPCE -internal class FirPhaseRunner { +internal class LLFirPhaseRunner { /** * We temporary disable multi-locks to fix deadlocks problem * @see org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LockProvider diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirModuleResolveState.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirModuleResolveState.kt similarity index 98% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirModuleResolveState.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirModuleResolveState.kt index 38c5b40eb89..cc4ea6732a5 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirModuleResolveState.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirModuleResolveState.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtLambdaExpression -abstract class FirModuleResolveState { +abstract class LLFirModuleResolveState { abstract val project: Project abstract val rootModuleSession: FirSession diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt index add001942e7..20d1b140e08 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.api import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirIdeResolveStateService +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirResolveStateService import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.analysis.project.structure.getKtModule import org.jetbrains.kotlin.diagnostics.KtPsiDiagnostic @@ -20,18 +20,18 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile /** - * Returns [FirModuleResolveState] which corresponds to containing module + * Returns [LLFirModuleResolveState] which corresponds to containing module */ -fun KtElement.getResolveState(): FirModuleResolveState { +fun KtElement.getResolveState(): LLFirModuleResolveState { val project = project return getKtModule(project).getResolveState(project) } /** - * Returns [FirModuleResolveState] which corresponds to containing module + * Returns [LLFirModuleResolveState] which corresponds to containing module */ -fun KtModule.getResolveState(project: Project): FirModuleResolveState = - FirIdeResolveStateService.getInstance(project).getResolveState(this) +fun KtModule.getResolveState(project: Project): LLFirModuleResolveState = + LLFirResolveStateService.getInstance(project).getResolveState(this) /** @@ -40,7 +40,7 @@ fun KtModule.getResolveState(project: Project): FirModuleResolveState = * */ fun KtDeclaration.resolveToFirSymbol( - resolveState: FirModuleResolveState, + resolveState: LLFirModuleResolveState, phase: FirResolvePhase = FirResolvePhase.RAW_FIR, ): FirBasedSymbol<*> { return resolveState.resolveToFirSymbol(this, phase) @@ -54,7 +54,7 @@ fun KtDeclaration.resolveToFirSymbol( */ @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") inline fun > KtDeclaration.resolveToFirSymbolOfType( - resolveState: FirModuleResolveState, + resolveState: LLFirModuleResolveState, phase: FirResolvePhase = FirResolvePhase.RAW_FIR, ): @kotlin.internal.NoInfer S { val symbol = resolveToFirSymbol(resolveState, phase) @@ -72,7 +72,7 @@ inline fun > KtDeclaration.resolveToFirSymbolOfTyp */ @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") inline fun > KtDeclaration.resolveToFirSymbolOfTypeSafe( - resolveState: FirModuleResolveState, + resolveState: LLFirModuleResolveState, phase: FirResolvePhase = FirResolvePhase.RAW_FIR, ): @kotlin.internal.NoInfer S? { return resolveToFirSymbol(resolveState, phase) as? S @@ -83,7 +83,7 @@ inline fun > KtDeclaration.resolveToFirSymbolOfTyp * Returns a list of Diagnostics compiler finds for given [KtElement] * This operation could be performance affective because it create FIleStructureElement and resolve non-local declaration into BODY phase */ -fun KtElement.getDiagnostics(resolveState: FirModuleResolveState, filter: DiagnosticCheckerFilter): Collection = +fun KtElement.getDiagnostics(resolveState: LLFirModuleResolveState, filter: DiagnosticCheckerFilter): Collection = resolveState.getDiagnostics(this, filter) /** @@ -91,7 +91,7 @@ fun KtElement.getDiagnostics(resolveState: FirModuleResolveState, filter: Diagno * This operation could be performance affective because it create FIleStructureElement and resolve non-local declaration into BODY phase */ fun KtFile.collectDiagnosticsForFile( - resolveState: FirModuleResolveState, + resolveState: LLFirModuleResolveState, filter: DiagnosticCheckerFilter ): Collection = resolveState.collectDiagnosticsForFile(this, filter) @@ -104,7 +104,7 @@ fun KtFile.collectDiagnosticsForFile( * The `null` value is returned iff FIR tree does not have corresponding element */ fun KtElement.getOrBuildFir( - resolveState: FirModuleResolveState, + resolveState: LLFirModuleResolveState, ): FirElement? = resolveState.getOrBuildFirFor(this) /** @@ -113,7 +113,7 @@ fun KtElement.getOrBuildFir( * This operation could be performance affective because it create FIleStructureElement and resolve non-local declaration into BODY phase */ inline fun KtElement.getOrBuildFirSafe( - resolveState: FirModuleResolveState, + resolveState: LLFirModuleResolveState, ) = getOrBuildFir(resolveState) as? E /** @@ -122,7 +122,7 @@ inline fun KtElement.getOrBuildFirSafe( * This operation could be performance affective because it create FIleStructureElement and resolve non-local declaration into BODY phase */ inline fun KtElement.getOrBuildFirOfType( - resolveState: FirModuleResolveState, + resolveState: LLFirModuleResolveState, ): E { val fir = this.getOrBuildFir(resolveState) if (fir is E) return fir @@ -133,5 +133,5 @@ inline fun KtElement.getOrBuildFirOfType( * Get a [FirFile] which was created by [KtElement] * Returned [FirFile] can be resolved to any phase from [FirResolvePhase.RAW_FIR] to [FirResolvePhase.BODY_RESOLVE] */ -fun KtFile.getOrBuildFirFile(resolveState: FirModuleResolveState): FirFile = +fun KtFile.getOrBuildFirFile(resolveState: LLFirModuleResolveState): FirFile = resolveState.getOrBuildFirFile(this) 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 16360f3cb14..19fcf2e6ea7 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 @@ -63,7 +63,7 @@ object LowLevelFirApiFacadeForResolveOnAir { } fun onAirResolveElement( - state: FirModuleResolveState, + state: LLFirModuleResolveState, place: T, elementToResolve: T, ): FirElement { @@ -92,7 +92,7 @@ object LowLevelFirApiFacadeForResolveOnAir { } fun onAirGetTowerContextProvider( - state: FirModuleResolveState, + state: LLFirModuleResolveState, place: KtElement, ): FirTowerContextProvider { require(state is LLFirResolvableModuleResolveState) @@ -140,10 +140,10 @@ object LowLevelFirApiFacadeForResolveOnAir { } fun getResolveStateForDependentCopy( - originalState: FirModuleResolveState, + originalState: LLFirModuleResolveState, originalKtFile: KtFile, elementToAnalyze: KtElement - ): FirModuleResolveState { + ): LLFirModuleResolveState { require(originalState is LLFirResolvableModuleResolveState) require(elementToAnalyze !is KtFile) { "KtFile for dependency element not supported" } require(!elementToAnalyze.isPhysical) { "Depended state should be build only for non-physical elements" } @@ -299,7 +299,7 @@ object LowLevelFirApiFacadeForResolveOnAir { fun onAirResolveTypeInPlace( place: KtElement, typeReference: KtTypeReference, - state: FirModuleResolveState, + state: LLFirModuleResolveState, ): FirResolvedTypeRef { val context = state.getTowerContextProvider(place.containingKtFile).getClosestAvailableParentContext(place) ?: error("TowerContext not found for ${place.getElementTextInContext()}") diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/AbstractFirIdeDiagnosticsCollector.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/AbstractFirIdeDiagnosticsCollector.kt index bc73d7e5527..e448e15e37d 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/AbstractFirIdeDiagnosticsCollector.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/AbstractFirIdeDiagnosticsCollector.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.moduleData import org.jetbrains.kotlin.platform.SimplePlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatform -internal abstract class AbstractFirIdeDiagnosticsCollector( +internal abstract class AbstractLLFirDiagnosticsCollector( session: FirSession, useExtendedCheckers: Boolean, ) : AbstractDiagnosticCollector( diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt index 88241a82b1b..98feb108a1e 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt @@ -44,7 +44,7 @@ internal class SingleNonLocalDeclarationDiagnosticRetriever( private val structureElementDeclaration: FirDeclaration, context: CheckerContext, components: List - ) : FirIdeDiagnosticVisitor(context, components) { + ) : LLFirDiagnosticVisitor(context, components) { private var insideAlwaysVisitableDeclarations = 0 override fun shouldVisitDeclaration(declaration: FirDeclaration): Boolean { @@ -104,7 +104,7 @@ internal object FileDiagnosticRetriever : FileStructureElementDiagnosticRetrieve private class Visitor( firFile: FirFile, components: List - ) : FirIdeDiagnosticVisitor( + ) : LLFirDiagnosticVisitor( PersistentCheckerContextFactory.createEmptyPersistenceCheckerContext(SessionHolderImpl.createWithEmptyScopeSession(firFile.moduleData.session)), components, ) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticsCollector.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticsCollector.kt index c5bf44bd437..d4a1a37e500 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticsCollector.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticsCollector.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics import org.jetbrains.kotlin.fir.analysis.collectors.CheckerRunningDiagnosticCollectorVisitor import org.jetbrains.kotlin.fir.analysis.collectors.components.AbstractDiagnosticCollectorComponent import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.FirIdeStructureElementDiagnosticsCollector +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.LLFirStructureElementDiagnosticsCollector internal class FileStructureElementDiagnosticsCollector private constructor(private val useExtendedCheckers: Boolean) { companion object { @@ -20,8 +20,8 @@ internal class FileStructureElementDiagnosticsCollector private constructor(priv firDeclaration: FirDeclaration, createVisitor: (components: List) -> CheckerRunningDiagnosticCollectorVisitor, ): FileStructureElementDiagnosticList { - val reporter = FirIdeDiagnosticReporter() - val collector = FirIdeStructureElementDiagnosticsCollector( + val reporter = LLFirDiagnosticReporter() + val collector = LLFirStructureElementDiagnosticsCollector( firDeclaration.moduleData.session, createVisitor, useExtendedCheckers, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt index 1c6c447e077..3a07c0f4c39 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt @@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.low.level.api.fir.util.addValueFor import org.jetbrains.kotlin.diagnostics.* -internal class FirIdeDiagnosticReporter : DiagnosticReporter() { +internal class LLFirDiagnosticReporter : DiagnosticReporter() { val diagnostics = mutableMapOf>() override fun report(diagnostic: KtDiagnostic?, context: DiagnosticContext) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticVisitor.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticVisitor.kt index 5066989943b..79747f80c7a 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticVisitor.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticVisitor.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.analysis.collectors.components.AbstractDiagnosti import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkCanceled -internal open class FirIdeDiagnosticVisitor( +internal open class LLFirDiagnosticVisitor( context: CheckerContext, components: List, ) : CheckerRunningDiagnosticCollectorVisitor(context, components) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/FirIdeStructureElementDiagnosticsCollector.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/FirIdeStructureElementDiagnosticsCollector.kt index 16ca297f4de..c744d4c7e0a 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/FirIdeStructureElementDiagnosticsCollector.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/FirIdeStructureElementDiagnosticsCollector.kt @@ -8,13 +8,13 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.collectors.CheckerRunningDiagnosticCollectorVisitor import org.jetbrains.kotlin.fir.analysis.collectors.components.AbstractDiagnosticCollectorComponent -import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.AbstractFirIdeDiagnosticsCollector +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.AbstractLLFirDiagnosticsCollector -internal class FirIdeStructureElementDiagnosticsCollector( +internal class LLFirStructureElementDiagnosticsCollector( session: FirSession, private val doCreateVisitor: (components: List) -> CheckerRunningDiagnosticCollectorVisitor, useExtendedCheckers: Boolean, -) : AbstractFirIdeDiagnosticsCollector( +) : AbstractLLFirDiagnosticsCollector( session, useExtendedCheckers, ) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/PersistentCheckerContextFactory.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/PersistentCheckerContextFactory.kt index f8de29d44a0..41bb5cfe2da 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/PersistentCheckerContextFactory.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/PersistentCheckerContextFactory.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.SessionHolder import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.ImplicitBodyResolveComputationSession import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.createReturnTypeCalculatorForIDE -import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FirIdeDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator +import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.LLFirDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator internal object PersistentCheckerContextFactory { fun createEmptyPersistenceCheckerContext(sessionHolder: SessionHolder): PersistentCheckerContext { @@ -18,7 +18,7 @@ internal object PersistentCheckerContextFactory { sessionHolder.session, ScopeSession(), ImplicitBodyResolveComputationSession(), - ::FirIdeDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator + ::LLFirDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator ) return PersistentCheckerContext(sessionHolder, returnTypeCalculator) } 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 890566c5e40..80b157ab5e2 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 @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.resolve.ScopeSession -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.FirFileBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.FileStructureCache @@ -69,7 +69,7 @@ internal class FirElementBuilder { moduleFileCache: ModuleFileCache, fileStructureCache: FileStructureCache, firLazyDeclarationResolver: FirLazyDeclarationResolver, - state: FirModuleResolveState, + state: LLFirModuleResolveState, ): FirElement? = when (element) { is KtFile -> getOrBuildFirForKtFile(element, firFileBuilder, moduleFileCache, firLazyDeclarationResolver) else -> getOrBuildFirForNonKtFileElement(element, fileStructureCache, moduleFileCache, state) @@ -96,7 +96,7 @@ internal class FirElementBuilder { element: KtElement, fileStructureCache: FileStructureCache, moduleFileCache: ModuleFileCache, - state: FirModuleResolveState, + state: LLFirModuleResolveState, ): FirElement? { require(element !is KtFile) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirIdeDesignatedBodyResolveTransformerForReturnTypeCalculator.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirIdeDesignatedBodyResolveTransformerForReturnTypeCalculator.kt index c96fd2d64a3..91963622b57 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirIdeDesignatedBodyResolveTransformerForReturnTypeCalculator.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirIdeDesignatedBodyResolveTransformerForReturnTypeCalculator.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesigna import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyBodiesCalculator import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveTreeBuilder -fun FirIdeDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator( +fun LLFirDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator( designation: Iterator, session: FirSession, scopeSession: ScopeSession, @@ -34,7 +34,7 @@ fun FirIdeDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator( designation.forEachRemaining(designationList::add) require(designationList.isNotEmpty()) { "Designation should not be empty" } - return FirIdeDesignatedBodyResolveTransformerForReturnTypeCalculatorImpl( + return LLFirDesignatedBodyResolveTransformerForReturnTypeCalculatorImpl( designationList, session, scopeSession, @@ -44,7 +44,7 @@ fun FirIdeDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator( ) } -private class FirIdeDesignatedBodyResolveTransformerForReturnTypeCalculatorImpl( +private class LLFirDesignatedBodyResolveTransformerForReturnTypeCalculatorImpl( private val designation: List, session: FirSession, scopeSession: ScopeSession, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirIdeEnsureBasedTransformerForReturnTypeCalculator.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirIdeEnsureBasedTransformerForReturnTypeCalculator.kt index 780a4b24fc6..20f6d9c069b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirIdeEnsureBasedTransformerForReturnTypeCalculator.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirIdeEnsureBasedTransformerForReturnTypeCalculator.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.symbols.ensureResolved import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef -fun FirIdeEnsureBasedTransformerForReturnTypeCalculator( +fun LLFirEnsureBasedTransformerForReturnTypeCalculator( designation: Iterator, session: FirSession, scopeSession: ScopeSession, @@ -31,7 +31,7 @@ fun FirIdeEnsureBasedTransformerForReturnTypeCalculator( designation.forEachRemaining(designationList::add) require(designationList.isNotEmpty()) { "Designation should not be empty" } - return FirIdeEnsureBasedTransformerForReturnTypeCalculatorImpl( + return LLFirEnsureBasedTransformerForReturnTypeCalculatorImpl( designationList, session, scopeSession, @@ -42,7 +42,7 @@ fun FirIdeEnsureBasedTransformerForReturnTypeCalculator( } -private class FirIdeEnsureBasedTransformerForReturnTypeCalculatorImpl( +private class LLFirEnsureBasedTransformerForReturnTypeCalculatorImpl( designation: List, session: FirSession, scopeSession: ScopeSession, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/FirFileBuilder.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/FirFileBuilder.kt index a5f5def0180..40dd23025da 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/FirFileBuilder.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/FirFileBuilder.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.builder.BodyBuildingMode import org.jetbrains.kotlin.fir.builder.PsiHandlingMode import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.scopes.FirScopeProvider -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner import org.jetbrains.kotlin.psi.KtFile /** @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.psi.KtFile @ThreadSafe internal class FirFileBuilder( private val scopeProvider: FirScopeProvider, - val firPhaseRunner: FirPhaseRunner + val firPhaseRunner: LLFirPhaseRunner ) { /** * Builds a [FirFile] by given [ktFile] and records it's parenting info if it not present in [cache] diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirLibraryResolveModuleFileCache.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirLibraryResolveModuleFileCache.kt index d5e66eea499..eecd5c089ce 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirLibraryResolveModuleFileCache.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirLibraryResolveModuleFileCache.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FirTowerDataContextAllElementsCollector import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.FirElementsRecorder import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.KtToFirMapping @@ -29,7 +29,7 @@ internal class LLFirLibraryResolveModuleFileCache( val kotlinScopeProvider: FirScopeProvider, override val session: LLFirLibraryOrLibrarySourceResolvableModuleSession ) : ModuleFileCache() { - private val firFileBuilder = FirFileBuilder(kotlinScopeProvider, FirPhaseRunner()) + private val firFileBuilder = FirFileBuilder(kotlinScopeProvider, LLFirPhaseRunner()) private val firLazyDeclarationResolver = FirLazyDeclarationResolver(firFileBuilder) 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 367ef2c0e99..3da44244750 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 @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.getNonLoc import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.FirFileBuilder 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.providers.FirIdeProvider +import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.LLFirProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.util.findSourceNonLocalFirDeclaration import org.jetbrains.kotlin.analysis.low.level.api.fir.util.getElementTextInContext import org.jetbrains.kotlin.diagnostics.KtPsiDiagnostic diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureCache.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureCache.kt index 3c111363026..01c80ddfaaa 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureCache.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureCache.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.psi.KtFile import java.util.concurrent.ConcurrentHashMap /** - * Belongs to a [org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState] + * Belongs to a [org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState] */ internal class FileStructureCache( private val fileBuilder: FirFileBuilder, 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 8541629d262..1607542dfed 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 @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LowLevelFirApiFacadeForResolveOnAir import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignation import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.FileDiagnosticRetriever @@ -17,8 +17,6 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCa import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyDeclarationResolver import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.RawFirNonLocalDeclarationBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.declarationCanBeLazilyResolved -import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.FirIdeProvider -import org.jetbrains.kotlin.analysis.low.level.api.fir.state.LLFirResolvableModuleResolveState import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.psi @@ -40,7 +38,7 @@ internal class KtToFirMapping(firElement: FirElement, recorder: FirElementsRecor private val mapping = FirElementsRecorder.recordElementsFrom(firElement, recorder) private val userTypeMapping = ConcurrentHashMap() - fun getElement(ktElement: KtElement, state: FirModuleResolveState): FirElement? { + fun getElement(ktElement: KtElement, state: LLFirModuleResolveState): FirElement? { mapping[ktElement]?.let { return it } val userType = when (ktElement) { @@ -58,7 +56,7 @@ internal class KtToFirMapping(firElement: FirElement, recorder: FirElementsRecor } } - fun getFirOfClosestParent(element: KtElement, state: FirModuleResolveState): FirElement? { + fun getFirOfClosestParent(element: KtElement, state: LLFirModuleResolveState): FirElement? { var current: PsiElement? = element while (current != null && current !is KtFile) { if (current is KtElement) { 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/FirLazyDeclarationResolver.kt index c122ede55f1..799afa63d06 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/FirLazyDeclarationResolver.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.getNonLoc import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.FirFileBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.runCustomResolveUnderLock -import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.FirFileAnnotationsResolveTransformer -import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.FirProviderInterceptorForIDE +import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirFileAnnotationsResolveTransformer +import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirFirProviderInterceptor import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LazyTransformerFactory import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkCanceled import org.jetbrains.kotlin.analysis.low.level.api.fir.util.findSourceNonLocalFirDeclaration @@ -69,7 +69,7 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui } if (!annotations.all { it.resolved }) { - FirFileAnnotationsResolveTransformer( + LLFirFileAnnotationsResolveTransformer( firFile = firFile, annotations = annotations, session = firFile.moduleData.session, @@ -387,7 +387,7 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui val scopeSession = ScopeSession() val firProviderInterceptor = if (onAirCreatedDeclaration) { - FirProviderInterceptorForIDE.createForFirElement( + LLFirFirProviderInterceptor.createForFirElement( session = designation.firFile.moduleData.session, firFile = designation.firFile, element = designation.declaration diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinSymbolProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinSymbolProvider.kt index 25fed15bdd4..36b2f64ca4b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinSymbolProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinSymbolProvider.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -class FirIdeBuiltinSymbolProvider( +class LLFirBuiltinSymbolProvider( session: FirSession, moduleData: FirModuleData, kotlinScopeProvider: FirKotlinScopeProvider diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt index c94bb4a67b3..c81dcdefaec 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -internal class FirIdeBuiltinsAndCloneableSessionProvider(override val symbolProvider: FirSymbolProvider) : FirProvider() { +internal class LLFirBuiltinsAndCloneableSessionProvider(override val symbolProvider: FirSymbolProvider) : FirProvider() { override fun getFirClassifierByFqName(classId: ClassId): FirClassLikeDeclaration? = symbolProvider.getClassLikeSymbolByClassId(classId)?.fir @@ -26,5 +26,5 @@ internal class FirIdeBuiltinsAndCloneableSessionProvider(override val symbolProv override fun getClassNamesInPackage(fqName: FqName): Set = shouldNotBeCalled() - private fun shouldNotBeCalled(): Nothing = error("Should not be called for FirIdeBuiltinsAndCloneableSession") + private fun shouldNotBeCalled(): Nothing = error("Should not be called for LLFirBuiltinsAndCloneableSession") } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeLibrariesSessionProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeLibrariesSessionProvider.kt index ca7bbdec7e9..ad5b3e6fb3f 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeLibrariesSessionProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeLibrariesSessionProvider.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -internal class FirIdeLibrariesSessionProvider( +internal class LLFirLibrariesSessionProvider( override val symbolProvider: FirSymbolProvider ) : FirProvider() { override fun getFirClassifierByFqName(classId: ClassId): FirClassLikeDeclaration? = @@ -28,6 +28,6 @@ internal class FirIdeLibrariesSessionProvider( override fun getClassNamesInPackage(fqName: FqName): Set = shouldNotBeCalled() - private fun shouldNotBeCalled(): Nothing = error("Should not be called for FirIdeLibrariesSessionProvider") + private fun shouldNotBeCalled(): Nothing = error("Should not be called for LLFirLibrariesSessionProvider") } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeProvider.kt index b16b66ee4fb..469ebba2dea 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeProvider.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @ThreadSafeMutableState -internal class FirIdeProvider( +internal class LLFirProvider( @Suppress("UNUSED_PARAMETER") project: Project, val session: FirSession, @Suppress("UNUSED_PARAMETER") module: KtModule, @@ -40,7 +40,7 @@ internal class FirIdeProvider( ) : FirProvider() { override val symbolProvider: FirSymbolProvider = SymbolProvider() - private val providerHelper = FirProviderHelper( + private val providerHelper = LLFirProviderHelper( cache, firFileBuilder, declarationProvider, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirLibraryResolvableProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirLibraryResolvableProvider.kt index 3a63e6853f8..9d42a935c46 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirLibraryResolvableProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirLibraryResolvableProvider.kt @@ -32,5 +32,5 @@ internal class LLFirLibraryResolvableProvider( override fun getClassNamesInPackage(fqName: FqName): Set = shouldNotBeCalled() - private fun shouldNotBeCalled(): Nothing = error("Should not be called for FirIdeLibrariesSessionProvider") + private fun shouldNotBeCalled(): Nothing = error("Should not be called for LLFirLibrariesSessionProvider") } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirModuleWithDependenciesSymbolProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirModuleWithDependenciesSymbolProvider.kt similarity index 92% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirModuleWithDependenciesSymbolProvider.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirModuleWithDependenciesSymbolProvider.kt index deaebd1928c..6cf3acca64b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirModuleWithDependenciesSymbolProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirModuleWithDependenciesSymbolProvider.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -internal class FirModuleWithDependenciesSymbolProvider( +internal class LLFirModuleWithDependenciesSymbolProvider( session: FirSession, private val providers: List, val dependencyProvider: DependentModuleProviders @@ -81,7 +81,7 @@ internal class DependentModuleProviders(session: FirSession, private val provide override fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? = providers.firstNotNullOfOrNull { provider -> when (provider) { - is FirModuleWithDependenciesSymbolProvider -> provider.getClassLikeSymbolByFqNameWithoutDependencies(classId) + is LLFirModuleWithDependenciesSymbolProvider -> provider.getClassLikeSymbolByFqNameWithoutDependencies(classId) else -> provider.getClassLikeSymbolByClassId(classId) } } @@ -91,7 +91,7 @@ internal class DependentModuleProviders(session: FirSession, private val provide override fun getTopLevelCallableSymbolsTo(destination: MutableList>, packageFqName: FqName, name: Name) { providers.forEach { provider -> when (provider) { - is FirModuleWithDependenciesSymbolProvider -> + is LLFirModuleWithDependenciesSymbolProvider -> provider.getTopLevelCallableSymbolsToWithoutDependencies(destination, packageFqName, name) else -> provider.getTopLevelCallableSymbolsTo(destination, packageFqName, name) } @@ -102,7 +102,7 @@ internal class DependentModuleProviders(session: FirSession, private val provide override fun getTopLevelFunctionSymbolsTo(destination: MutableList, packageFqName: FqName, name: Name) { providers.forEach { provider -> when (provider) { - is FirModuleWithDependenciesSymbolProvider -> + is LLFirModuleWithDependenciesSymbolProvider -> provider.getTopLevelFunctionSymbolsToWithoutDependencies(destination, packageFqName, name) else -> provider.getTopLevelFunctionSymbolsTo(destination, packageFqName, name) } @@ -113,7 +113,7 @@ internal class DependentModuleProviders(session: FirSession, private val provide override fun getTopLevelPropertySymbolsTo(destination: MutableList, packageFqName: FqName, name: Name) { providers.forEach { provider -> when (provider) { - is FirModuleWithDependenciesSymbolProvider -> + is LLFirModuleWithDependenciesSymbolProvider -> provider.getTopLevelPropertySymbolsToWithoutDependencies(destination, packageFqName, name) else -> provider.getTopLevelPropertySymbolsTo(destination, packageFqName, name) } @@ -123,7 +123,7 @@ internal class DependentModuleProviders(session: FirSession, private val provide override fun getPackage(fqName: FqName): FqName? = providers.firstNotNullOfOrNull { provider -> when (provider) { - is FirModuleWithDependenciesSymbolProvider -> provider.getPackageWithoutDependencies(fqName) + is LLFirModuleWithDependenciesSymbolProvider -> provider.getPackageWithoutDependencies(fqName) else -> provider.getPackage(fqName) } } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirProviderHelper.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProviderHelper.kt similarity index 99% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirProviderHelper.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProviderHelper.kt index 3d6bad7aff0..1ec428d77d6 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirProviderHelper.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProviderHelper.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtFile import java.util.* -internal class FirProviderHelper( +internal class LLFirProviderHelper( private val cache: ModuleFileCache, private val firFileBuilder: FirFileBuilder, private val declarationProvider: KotlinDeclarationProvider, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeLibrarySession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeLibrarySession.kt index bb32253f6a9..2276ac681c0 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeLibrarySession.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeLibrarySession.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.sessions import com.intellij.openapi.project.Project -import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.fir.BuiltinTypes import org.jetbrains.kotlin.fir.PrivateSessionConstructor @@ -14,7 +13,7 @@ import org.jetbrains.kotlin.fir.PrivateSessionConstructor * [org.jetbrains.kotlin.fir.FirSession] responsible for all libraries analysing module transitively depends on */ @OptIn(PrivateSessionConstructor::class) -internal class FirIdeLibrariesSession @PrivateSessionConstructor constructor( +internal class LLFirLibrariesSession @PrivateSessionConstructor constructor( override val project: Project, builtinTypes: BuiltinTypes, -) : FirIdeSession(builtinTypes, Kind.Library) +) : LLFirSession(builtinTypes, Kind.Library) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionFactory.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionFactory.kt index 931cdb96478..e0a9412c114 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionFactory.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionFactory.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.sessions import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.ProjectScope -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner -import org.jetbrains.kotlin.analysis.low.level.api.fir.IdeFirPhaseManager +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseManager import org.jetbrains.kotlin.analysis.low.level.api.fir.IdeSessionComponents import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.createPackagePartProviderForLibrary import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.createSealedInheritorsProvider @@ -54,26 +54,26 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformAnalyzerServices import java.nio.file.Path @OptIn(PrivateSessionConstructor::class, SessionConfiguration::class) -internal object FirIdeSessionFactory { +internal object LLFirSessionFactory { fun createSourcesSession( project: Project, module: KtSourceModule, - builtinsAndCloneableSession: FirIdeBuiltinsAndCloneableSession, - firPhaseRunner: FirPhaseRunner, - sessionInvalidator: FirSessionInvalidator, + builtinsAndCloneableSession: LLFirBuiltinsAndCloneableSession, + firPhaseRunner: LLFirPhaseRunner, + sessionInvalidator: LLFirSessionInvalidator, builtinTypes: BuiltinTypes, sessionsCache: MutableMap, isRootModule: Boolean, librariesCache: LibrariesCache, - configureSession: (FirIdeSession.() -> Unit)? = null - ): FirIdeSourcesSession { - sessionsCache[module]?.let { return it as FirIdeSourcesSession } + configureSession: (LLFirSession.() -> Unit)? = null + ): LLFirSourcesSession { + sessionsCache[module]?.let { return it as LLFirSourcesSession } val languageVersionSettings = module.languageVersionSettings val scopeProvider = FirKotlinScopeProvider(::wrapScopeWithJvmMapped) val firBuilder = FirFileBuilder(scopeProvider, firPhaseRunner) val contentScope = module.contentScope val dependentModules = module.directRegularDependenciesOfType() - val session = FirIdeSourcesSession(module, project, firBuilder, builtinTypes) + val session = LLFirSourcesSession(module, project, firBuilder, builtinTypes) sessionsCache[module] = session return session.apply session@{ @@ -82,14 +82,14 @@ internal object FirIdeSessionFactory { register(FirKotlinScopeProvider::class, scopeProvider) val cache = ModuleFileCacheImpl(this) - val firPhaseManager = IdeFirPhaseManager(FirLazyDeclarationResolver(firFileBuilder), cache, sessionInvalidator) + val firPhaseManager = LLFirPhaseManager(FirLazyDeclarationResolver(firFileBuilder), cache, sessionInvalidator) registerIdeComponents(project) registerCommonComponents(languageVersionSettings) registerCommonJavaComponents(JavaModuleResolver.getInstance(project)) registerResolveComponents() - val provider = FirIdeProvider( + val provider = LLFirProvider( project, this, module, @@ -101,7 +101,7 @@ internal object FirIdeSessionFactory { ) register(FirProvider::class, provider) - register(FirIdeProvider::class, provider) + register(LLFirProvider::class, provider) register(FirPhaseManager::class, firPhaseManager) @@ -139,7 +139,7 @@ internal object FirIdeSessionFactory { register( FirSymbolProvider::class, - FirModuleWithDependenciesSymbolProvider( + LLFirModuleWithDependenciesSymbolProvider( this, providers = listOf( provider.symbolProvider, @@ -173,15 +173,15 @@ internal object FirIdeSessionFactory { private fun createModuleLibrariesSession( sourceModule: KtSourceModule, project: Project, - builtinsAndCloneableSession: FirIdeBuiltinsAndCloneableSession, + builtinsAndCloneableSession: LLFirBuiltinsAndCloneableSession, builtinTypes: BuiltinTypes, librariesCache: LibrariesCache, languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT, - configureSession: (FirIdeSession.() -> Unit)?, - ): FirIdeLibrariesSession = librariesCache.cached(sourceModule) { + configureSession: (LLFirSession.() -> Unit)?, + ): LLFirLibrariesSession = librariesCache.cached(sourceModule) { checkCanceled() val searchScope = project.moduleScopeProvider.getModuleLibrariesScope(sourceModule) - FirIdeLibrariesSession(project, builtinTypes).apply session@{ + LLFirLibrariesSession(project, builtinTypes).apply session@{ registerModuleData(KtModuleBasedModuleData(sourceModule).apply { bindSession(this@session) }) registerIdeComponents(project) register(FirPhaseManager::class, FirPhaseCheckingPhaseManager) @@ -206,14 +206,14 @@ internal object FirIdeSessionFactory { ) val symbolProvider = FirCompositeSymbolProvider(this, listOf(classFileBasedSymbolProvider, builtinsAndCloneableSession.symbolProvider)) - register(FirProvider::class, FirIdeLibrariesSessionProvider(symbolProvider)) + register(FirProvider::class, LLFirLibrariesSessionProvider(symbolProvider)) register(FirSymbolProvider::class, symbolProvider) register(FirJvmTypeMapper::class, FirJvmTypeMapper(this)) configureSession?.invoke(this) } } - private fun createModuleDataProvider(sourceModule: KtModule, session: FirIdeSession): ModuleDataProvider { + private fun createModuleDataProvider(sourceModule: KtModule, session: LLFirSession): ModuleDataProvider { val dependencyList = DependencyListForCliModule.build( Name.special("<${sourceModule.moduleDescription}>"), sourceModule.platform, @@ -232,9 +232,9 @@ internal object FirIdeSessionFactory { project: Project, builtinTypes: BuiltinTypes, languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT, - configureSession: (FirIdeSession.() -> Unit)? = null, - ): FirIdeBuiltinsAndCloneableSession { - return FirIdeBuiltinsAndCloneableSession(project, builtinTypes).apply session@{ + configureSession: (LLFirSession.() -> Unit)? = null, + ): LLFirBuiltinsAndCloneableSession { + return LLFirBuiltinsAndCloneableSession(project, builtinTypes).apply session@{ val moduleData = FirModuleDataImpl( Name.special(""), emptyList(), @@ -255,12 +255,12 @@ internal object FirIdeSessionFactory { val symbolProvider = FirCompositeSymbolProvider( this, listOf( - FirIdeBuiltinSymbolProvider(this, moduleData, kotlinScopeProvider), + LLFirBuiltinSymbolProvider(this, moduleData, kotlinScopeProvider), FirCloneableSymbolProvider(this, moduleData, kotlinScopeProvider), ) ) register(FirSymbolProvider::class, symbolProvider) - register(FirProvider::class, FirIdeBuiltinsAndCloneableSessionProvider(symbolProvider)) + register(FirProvider::class, LLFirBuiltinsAndCloneableSessionProvider(symbolProvider)) register(FirJvmTypeMapper::class, FirJvmTypeMapper(this)) configureSession?.invoke(this) } @@ -269,13 +269,13 @@ internal object FirIdeSessionFactory { fun creatLibraryOrLibrarySourceResolvableSession( project: Project, module: KtModule, - builtinsAndCloneableSession: FirIdeBuiltinsAndCloneableSession, - firPhaseRunner: FirPhaseRunner, - sessionInvalidator: FirSessionInvalidator, + builtinsAndCloneableSession: LLFirBuiltinsAndCloneableSession, + firPhaseRunner: LLFirPhaseRunner, + sessionInvalidator: LLFirSessionInvalidator, builtinTypes: BuiltinTypes, sessionsCache: MutableMap, languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT, - configureSession: (FirIdeSession.() -> Unit)? = null + configureSession: (LLFirSession.() -> Unit)? = null ): LLFirLibraryOrLibrarySourceResolvableModuleSession { LLFirLibraryOrLibrarySourceResolvableModuleSession.checkIsValidKtModule(module) sessionsCache[module]?.let { return it as LLFirLibraryOrLibrarySourceResolvableModuleSession } @@ -300,14 +300,14 @@ internal object FirIdeSessionFactory { register(FirKotlinScopeProvider::class, scopeProvider) val cache = ModuleFileCacheImpl(this) - val firPhaseManager = IdeFirPhaseManager(FirLazyDeclarationResolver(firFileBuilder), cache, sessionInvalidator) + val firPhaseManager = LLFirPhaseManager(FirLazyDeclarationResolver(firFileBuilder), cache, sessionInvalidator) registerIdeComponents(project) registerCommonComponents(languageVersionSettings) registerCommonJavaComponents(JavaModuleResolver.getInstance(project)) registerResolveComponents() - val provider = FirIdeProvider( + val provider = LLFirProvider( project, this, module, @@ -319,7 +319,7 @@ internal object FirIdeSessionFactory { ) register(FirProvider::class, provider) - register(FirIdeProvider::class, provider) + register(LLFirProvider::class, provider) register(FirPhaseManager::class, firPhaseManager) val dependentProviders = buildList { @@ -344,7 +344,7 @@ internal object FirIdeSessionFactory { register( FirSymbolProvider::class, - FirModuleWithDependenciesSymbolProvider( + LLFirModuleWithDependenciesSymbolProvider( this, providers = listOf( provider.symbolProvider, @@ -373,7 +373,7 @@ internal object FirIdeSessionFactory { } - private fun FirIdeSession.registerIdeComponents(project: Project) { + private fun LLFirSession.registerIdeComponents(project: Project) { register(IdeSessionComponents::class, IdeSessionComponents.create(this)) register(FirCachesFactory::class, FirThreadSafeCachesFactory) register(SealedClassInheritorsProvider::class, project.createSealedInheritorsProvider()) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionProvider.kt index bc6ada12ea3..f35770f11ac 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionProvider.kt @@ -9,23 +9,25 @@ import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.api.impl.barebone.annotations.Immutable import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache import org.jetbrains.kotlin.analysis.project.structure.KtModule -import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSessionProvider @Immutable -class FirIdeSessionProvider internal constructor( +class LLFirSessionProvider internal constructor( val project: Project, internal val rootModuleSession: LLFirResolvableModuleSession, - val sessions: Map + private val moduleToSession: Map ) : FirSessionProvider() { override fun getSession(moduleData: FirModuleData): FirSession? = - sessions[moduleData.module] + moduleToSession[moduleData.module] fun getSession(module: KtModule): FirSession? = - sessions[module] + moduleToSession[module] internal fun getModuleCache(module: KtModule): ModuleFileCache = - sessions.getValue(module).cache + moduleToSession.getValue(module).cache + + val allSessions: Collection + get() = moduleToSession.values } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionProviderStorage.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionProviderStorage.kt index 1127c7bb2d4..7cc1cb4b764 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionProviderStorage.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionProviderStorage.kt @@ -10,7 +10,7 @@ import com.intellij.openapi.util.ModificationTracker import kotlinx.collections.immutable.PersistentMap import kotlinx.collections.immutable.persistentMapOf import kotlinx.collections.immutable.toPersistentMap -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner import org.jetbrains.kotlin.analysis.low.level.api.fir.util.addValueFor import org.jetbrains.kotlin.analysis.low.level.api.fir.util.executeWithoutPCE import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule @@ -26,26 +26,26 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.moduleData import java.util.concurrent.ConcurrentHashMap -class FirIdeSessionProviderStorage(val project: Project) { +class LLFirSessionProviderStorage(val project: Project) { private val sessionsCache = ConcurrentHashMap() private val librariesCache by softCachedValue(project, project.createLibrariesModificationTracker()) { LibrariesCache() } fun getSessionProvider( rootModule: KtModule, - configureSession: (FirIdeSession.() -> Unit)? = null - ): FirIdeSessionProvider { - val firPhaseRunner = FirPhaseRunner() + configureSession: (LLFirSession.() -> Unit)? = null + ): LLFirSessionProvider { + val firPhaseRunner = LLFirPhaseRunner() val builtinTypes = BuiltinTypes() - val builtinsAndCloneableSession = FirIdeSessionFactory.createBuiltinsAndCloneableSession(project, builtinTypes) + val builtinsAndCloneableSession = LLFirSessionFactory.createBuiltinsAndCloneableSession(project, builtinTypes) val cache = sessionsCache.getOrPut(rootModule) { FromModuleViewSessionCache() } val (sessions, session) = cache.withMappings(project) { mappings -> val sessions = mutableMapOf().apply { putAll(mappings) } val session = executeWithoutPCE { when (rootModule) { is KtSourceModule -> { - FirIdeSessionFactory.createSourcesSession( + LLFirSessionFactory.createSourcesSession( project, rootModule, builtinsAndCloneableSession, @@ -58,7 +58,7 @@ class FirIdeSessionProviderStorage(val project: Project) { configureSession = configureSession, ) } - is KtLibraryModule, is KtLibrarySourceModule -> FirIdeSessionFactory.creatLibraryOrLibrarySourceResolvableSession( + is KtLibraryModule, is KtLibrarySourceModule -> LLFirSessionFactory.creatLibraryOrLibrarySourceResolvableSession( project, rootModule, builtinsAndCloneableSession, @@ -75,7 +75,7 @@ class FirIdeSessionProviderStorage(val project: Project) { sessions to session } - return FirIdeSessionProvider(project, session, sessions) + return LLFirSessionProvider(project, session, sessions) } } @@ -83,7 +83,7 @@ private class FromModuleViewSessionCache { @Volatile private var mappings: PersistentMap = persistentMapOf() - val sessionInvalidator: FirSessionInvalidator = FirSessionInvalidator { session -> + val sessionInvalidator: LLFirSessionInvalidator = LLFirSessionInvalidator { session -> mappings[session.moduleData.module]?.invalidate() } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeBuiltinsAndCloneableSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirBuiltinsAndCloneableSession.kt similarity index 80% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeBuiltinsAndCloneableSession.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirBuiltinsAndCloneableSession.kt index c0c3e868f8c..9bddaf39573 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeBuiltinsAndCloneableSession.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirBuiltinsAndCloneableSession.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.BuiltinTypes import org.jetbrains.kotlin.fir.PrivateSessionConstructor @OptIn(PrivateSessionConstructor::class) -class FirIdeBuiltinsAndCloneableSession @PrivateSessionConstructor constructor( +class LLFirBuiltinsAndCloneableSession @PrivateSessionConstructor constructor( override val project: Project, builtinTypes: BuiltinTypes, -) : FirIdeSession(builtinTypes, Kind.Library) +) : LLFirSession(builtinTypes, Kind.Library) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirResolvableModuleSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirResolvableModuleSession.kt index 3df0f7fcd0e..92066fc4a70 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirResolvableModuleSession.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirResolvableModuleSession.kt @@ -7,13 +7,13 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.sessions import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.FirFileBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache -import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.FirIdeProvider +import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.LLFirProvider import org.jetbrains.kotlin.fir.BuiltinTypes import org.jetbrains.kotlin.fir.resolve.providers.firProvider internal abstract class LLFirResolvableModuleSession( builtinTypes: BuiltinTypes, -) : FirIdeModuleSession(builtinTypes, Kind.Source) { - internal val cache: ModuleFileCache get() = (firProvider as FirIdeProvider).cache +) : LLFirModuleSession(builtinTypes, Kind.Source) { + internal val cache: ModuleFileCache get() = (firProvider as LLFirProvider).cache abstract val firFileBuilder: FirFileBuilder } \ No newline at end of file diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSession.kt similarity index 70% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSession.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSession.kt index 3c0468a5bae..4c4278775a8 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSession.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSession.kt @@ -6,18 +6,17 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.sessions import com.intellij.openapi.project.Project -import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.fir.BuiltinTypes import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.PrivateSessionConstructor @OptIn(PrivateSessionConstructor::class) -abstract class FirIdeSession(override val builtinTypes: BuiltinTypes, kind: Kind) : FirSession(sessionProvider = null, kind) { +abstract class LLFirSession(override val builtinTypes: BuiltinTypes, kind: Kind) : FirSession(sessionProvider = null, kind) { abstract val project: Project } @OptIn(PrivateSessionConstructor::class) -abstract class FirIdeModuleSession(builtinTypes: BuiltinTypes, kind: Kind) : FirIdeSession(builtinTypes, kind) { +abstract class LLFirModuleSession(builtinTypes: BuiltinTypes, kind: Kind) : LLFirSession(builtinTypes, kind) { abstract val module: KtModule } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirSessionInvalidator.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionInvalidator.kt similarity index 79% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirSessionInvalidator.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionInvalidator.kt index c1fa3ab02a8..b85bee1ba42 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirSessionInvalidator.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionInvalidator.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.sessions import org.jetbrains.kotlin.fir.FirSession -internal class FirSessionInvalidator(private val invalidateSourcesSession: (LLFirResolvableModuleSession) -> Unit) { +internal class LLFirSessionInvalidator(private val invalidateSourcesSession: (LLFirResolvableModuleSession) -> Unit) { fun invalidate(session: FirSession) { require(session is LLFirResolvableModuleSession) invalidateSourcesSession(session) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSourcesSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSourcesSession.kt similarity index 91% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSourcesSession.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSourcesSession.kt index 7be7868b8bd..df3e347afd4 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSourcesSession.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSourcesSession.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule import org.jetbrains.kotlin.fir.BuiltinTypes import org.jetbrains.kotlin.fir.PrivateSessionConstructor -internal class FirIdeSourcesSession @PrivateSessionConstructor constructor( +internal class LLFirSourcesSession @PrivateSessionConstructor constructor( override val module: KtSourceModule, override val project: Project, override val firFileBuilder: FirFileBuilder, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LibrariesCache.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LibrariesCache.kt index 9a08b95bf6d..d79da05de4a 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LibrariesCache.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LibrariesCache.kt @@ -6,16 +6,15 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.sessions import org.jetbrains.kotlin.analysis.project.structure.KtModule -import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule import java.util.concurrent.ConcurrentHashMap @JvmInline internal value class LibrariesCache( - private val cache: ConcurrentHashMap = ConcurrentHashMap() + private val cache: ConcurrentHashMap = ConcurrentHashMap() ) { fun cached( module: KtModule, - create: (KtModule) -> FirIdeLibrariesSession - ): FirIdeLibrariesSession = + create: (KtModule) -> LLFirLibrariesSession + ): LLFirLibrariesSession = cache.computeIfAbsent(module, create) } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirLibraryOrLibrarySourceResolvableModuleResolveState.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirLibraryOrLibrarySourceResolvableModuleResolveState.kt index ac9858638a2..f5f5ebf7a83 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirLibraryOrLibrarySourceResolvableModuleResolveState.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirLibraryOrLibrarySourceResolvableModuleResolveState.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.FirFileBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyDeclarationResolver -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSessionProvider +import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSessionProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirLibraryOrLibrarySourceResolvableModuleSession import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.diagnostics.KtPsiDiagnostic @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.KtFile internal class LLFirLibraryOrLibrarySourceResolvableModuleResolveState( override val project: Project, override val module: KtModule, - sessionProvider: FirIdeSessionProvider, + sessionProvider: LLFirSessionProvider, firFileBuilder: FirFileBuilder, firLazyDeclarationResolver: FirLazyDeclarationResolver, ) : LLFirResolvableModuleResolveState(sessionProvider, firFileBuilder, firLazyDeclarationResolver) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableModuleResolveState.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableModuleResolveState.kt index b352ff8f620..142e6b3a1d7 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableModuleResolveState.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableModuleResolveState.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.state -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FirElementBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FirTowerContextProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.getNonLocalContainingOrThisDeclaration @@ -13,9 +13,9 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.FirFileBuild import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache 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.providers.FirIdeProvider -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSessionProvider -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSourcesSession +import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.LLFirProvider +import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSessionProvider +import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSourcesSession import org.jetbrains.kotlin.analysis.low.level.api.fir.util.FirDeclarationForCompiledElementSearcher import org.jetbrains.kotlin.analysis.low.level.api.fir.util.findSourceNonLocalFirDeclaration import org.jetbrains.kotlin.analysis.low.level.api.fir.util.getElementTextInContext @@ -36,12 +36,12 @@ import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.psi.* internal abstract class LLFirResolvableModuleResolveState( - protected val sessionProvider: FirIdeSessionProvider, + protected val sessionProvider: LLFirSessionProvider, val firFileBuilder: FirFileBuilder, val firLazyDeclarationResolver: FirLazyDeclarationResolver, -) : FirModuleResolveState() { +) : LLFirModuleResolveState() { final override val rootModuleSession = sessionProvider.rootModuleSession - val cache = (rootModuleSession.firProvider as FirIdeProvider).cache + val cache = (rootModuleSession.firProvider as LLFirProvider).cache val fileStructureCache = FileStructureCache(firFileBuilder, firLazyDeclarationResolver) val elementBuilder = FirElementBuilder() @@ -127,7 +127,7 @@ internal abstract class LLFirResolvableModuleResolveState( override fun resolveFirToPhase(declaration: FirDeclaration, toPhase: FirResolvePhase) { if (toPhase == FirResolvePhase.RAW_FIR) return val fileCache = when (val session = declaration.moduleData.session) { - is FirIdeSourcesSession -> session.cache + is LLFirSourcesSession -> session.cache else -> return } firLazyDeclarationResolver.lazyResolveDeclaration( diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/FirSourceModuleResolveState.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceModuleResolveState.kt similarity index 95% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/FirSourceModuleResolveState.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceModuleResolveState.kt index f4503e6dc25..973429e896e 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/FirSourceModuleResolveState.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceModuleResolveState.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilt import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.DiagnosticsCollector import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.FirFileBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyDeclarationResolver -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSessionProvider +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 import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule @@ -19,10 +19,10 @@ import org.jetbrains.kotlin.diagnostics.KtPsiDiagnostic import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile -internal class FirSourceModuleResolveState( +internal class LLFirSourceModuleResolveState( override val project: Project, override val module: KtModule, - sessionProvider: FirIdeSessionProvider, + sessionProvider: LLFirSessionProvider, firFileBuilder: FirFileBuilder, firLazyDeclarationResolver: FirLazyDeclarationResolver, ) : LLFirResolvableModuleResolveState(sessionProvider, firFileBuilder, firLazyDeclarationResolver) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/TowerProviderForElementForState.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/TowerProviderForElementForState.kt index 5ce52ab4b7b..069ee6a4c4f 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/TowerProviderForElementForState.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/TowerProviderForElementForState.kt @@ -6,20 +6,25 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.state import org.jetbrains.kotlin.analysis.low.level.api.fir.FirModuleResolveStateDepended -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LowLevelFirApiFacadeForResolveOnAir import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FirTowerContextProvider import org.jetbrains.kotlin.fir.declarations.FirTowerDataContext import org.jetbrains.kotlin.psi.KtElement -internal class TowerProviderForElementForState(private val state: FirModuleResolveState) : FirTowerContextProvider { +internal class TowerProviderForElementForState(private val state: LLFirModuleResolveState) : FirTowerContextProvider { override fun getClosestAvailableParentContext(ktElement: KtElement): FirTowerDataContext? { - return if (state is FirModuleResolveStateDepended) { - state.towerProviderBuiltUponElement.getClosestAvailableParentContext(ktElement) - ?: LowLevelFirApiFacadeForResolveOnAir.onAirGetTowerContextProvider(state.originalState, ktElement) - .getClosestAvailableParentContext(ktElement) - } else { - LowLevelFirApiFacadeForResolveOnAir.onAirGetTowerContextProvider(state, ktElement).getClosestAvailableParentContext(ktElement) + if (state is FirModuleResolveStateDepended) { + state.towerProviderBuiltUponElement + .getClosestAvailableParentContext(ktElement) + ?.let { return it } + + return LowLevelFirApiFacadeForResolveOnAir + .onAirGetTowerContextProvider(state.originalState, ktElement) + .getClosestAvailableParentContext(ktElement) } + return LowLevelFirApiFacadeForResolveOnAir + .onAirGetTowerContextProvider(state, ktElement) + .getClosestAvailableParentContext(ktElement) } } \ No newline at end of file diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/IDEDeclarationTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDeclarationTransformer.kt similarity index 96% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/IDEDeclarationTransformer.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDeclarationTransformer.kt index 14d20b46b61..4d62811b11d 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/IDEDeclarationTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDeclarationTransformer.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.visitors.FirDefaultTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignation -internal class IDEDeclarationTransformer(private val designation: FirDeclarationDesignation) { +internal class LLFirDeclarationTransformer(private val designation: FirDeclarationDesignation) { private val designationWithoutTargetIterator = designation.toSequence(includeTarget = false).iterator() private var isInsideTargetDeclaration: Boolean = false private var designationPassed: Boolean = false diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedAnnotationArgumentsResolveTransformerForIDE.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsResolveTransformer.kt similarity index 89% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedAnnotationArgumentsResolveTransformerForIDE.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsResolveTransformer.kt index 9acbdbe5c37..cca68cee1aa 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedAnnotationArgumentsResolveTransformerForIDE.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsResolveTransformer.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.transformers -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignationWithFile import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveTreeBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.util.ensurePhase @@ -16,11 +16,11 @@ import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.plugin.FirAnnotationArgumentsResolveTransformer import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef -internal class FirDesignatedAnnotationArgumentsResolveTransformerForIDE( +internal class LLFirDesignatedAnnotationArgumentsResolveTransformer( private val designation: FirDeclarationDesignationWithFile, session: FirSession, scopeSession: ScopeSession, -) : FirLazyTransformerForIDE, FirAnnotationArgumentsResolveTransformer(session, scopeSession) { +) : LLFirLazyTransformer, FirAnnotationArgumentsResolveTransformer(session, scopeSession) { private fun moveNextDeclaration(designationIterator: Iterator) { if (!designationIterator.hasNext()) { @@ -47,7 +47,7 @@ internal class FirDesignatedAnnotationArgumentsResolveTransformerForIDE( } } - override fun transformDeclaration(phaseRunner: FirPhaseRunner) { + override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { if (designation.declaration.resolvePhase >= FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) return designation.declaration.ensurePhase(FirResolvePhase.STATUS) @@ -59,7 +59,7 @@ internal class FirDesignatedAnnotationArgumentsResolveTransformerForIDE( } } - FirLazyTransformerForIDE.updatePhaseDeep(designation.declaration, FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) + LLFirLazyTransformer.updatePhaseDeep(designation.declaration, FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) ensureResolved(designation.declaration) ensureResolvedDeep(designation.declaration) } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedBodyResolveTransformerForIDE.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedBodyResolveTransformer.kt similarity index 88% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedBodyResolveTransformerForIDE.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedBodyResolveTransformer.kt index 77d9a6e2971..e1032ef0b28 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedBodyResolveTransformerForIDE.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedBodyResolveTransformer.kt @@ -14,23 +14,23 @@ import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirBodyResolve import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirTowerDataContextCollector import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.ImplicitBodyResolveComputationSession import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.createReturnTypeCalculatorForIDE -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignationWithFile -import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FirIdeEnsureBasedTransformerForReturnTypeCalculator +import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.LLFirEnsureBasedTransformerForReturnTypeCalculator import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveTreeBuilder -import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.FirLazyTransformerForIDE.Companion.updatePhaseDeep +import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirLazyTransformer.Companion.updatePhaseDeep import org.jetbrains.kotlin.analysis.low.level.api.fir.util.ensurePhase /** * Transform designation into BODY_RESOLVE declaration. Affects only for target declaration and it's children */ -internal class FirDesignatedBodyResolveTransformerForIDE( +internal class LLFirDesignatedBodyResolveTransformer( private val designation: FirDeclarationDesignationWithFile, session: FirSession, scopeSession: ScopeSession, towerDataContextCollector: FirTowerDataContextCollector?, firProviderInterceptor: FirProviderInterceptor?, -) : FirLazyTransformerForIDE, FirBodyResolveTransformer( +) : LLFirLazyTransformer, FirBodyResolveTransformer( session, phase = FirResolvePhase.BODY_RESOLVE, implicitTypeOnly = false, @@ -39,19 +39,19 @@ internal class FirDesignatedBodyResolveTransformerForIDE( session, scopeSession, ImplicitBodyResolveComputationSession(), - ::FirIdeEnsureBasedTransformerForReturnTypeCalculator + ::LLFirEnsureBasedTransformerForReturnTypeCalculator ), firTowerDataContextCollector = towerDataContextCollector, firProviderInterceptor = firProviderInterceptor, ) { - private val ideDeclarationTransformer = IDEDeclarationTransformer(designation) + private val ideDeclarationTransformer = LLFirDeclarationTransformer(designation) override fun transformDeclarationContent(declaration: FirDeclaration, data: ResolutionMode): FirDeclaration = ideDeclarationTransformer.transformDeclarationContent(this, declaration, data) { super.transformDeclarationContent(declaration, data) } - override fun transformDeclaration(phaseRunner: FirPhaseRunner) { + override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { if (designation.declaration.resolvePhase >= FirResolvePhase.BODY_RESOLVE) return designation.declaration.ensurePhase(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedContractsResolveTransformerForIDE.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedContractsResolveTransformer.kt similarity index 89% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedContractsResolveTransformerForIDE.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedContractsResolveTransformer.kt index 7dd6089a07a..6be9e96c78f 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedContractsResolveTransformerForIDE.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedContractsResolveTransformer.kt @@ -11,23 +11,23 @@ import org.jetbrains.kotlin.fir.resolve.ResolutionMode import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirDeclarationsResolveTransformer import org.jetbrains.kotlin.fir.resolve.transformers.contracts.FirContractResolveTransformer -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignationWithFile import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyBodiesCalculator import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveTreeBuilder -import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.FirLazyTransformerForIDE.Companion.updatePhaseDeep +import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirLazyTransformer.Companion.updatePhaseDeep import org.jetbrains.kotlin.analysis.low.level.api.fir.util.ensurePhase /** * Transform designation into CONTRACTS declaration. Affects only for target declaration and it's children */ -internal class FirDesignatedContractsResolveTransformerForIDE( +internal class LLFirDesignatedContractsResolveTransformer( private val designation: FirDeclarationDesignationWithFile, session: FirSession, scopeSession: ScopeSession, -) : FirLazyTransformerForIDE, FirContractResolveTransformer(session, scopeSession) { +) : LLFirLazyTransformer, FirContractResolveTransformer(session, scopeSession) { - private val ideDeclarationTransformer = IDEDeclarationTransformer(designation) + private val ideDeclarationTransformer = LLFirDeclarationTransformer(designation) override val declarationsTransformer: FirDeclarationsResolveTransformer = object : FirDeclarationsContractResolveTransformer(this) { override fun transformDeclarationContent(firClass: FirClass, data: ResolutionMode) { @@ -43,7 +43,7 @@ internal class FirDesignatedContractsResolveTransformerForIDE( super.transformDeclarationContent(declaration, data) } - override fun transformDeclaration(phaseRunner: FirPhaseRunner) { + override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { if (designation.declaration.resolvePhase >= FirResolvePhase.CONTRACTS) return designation.declaration.ensurePhase(FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedImplicitTypesTransformerForIDE.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedImplicitTypesTransformer.kt similarity index 88% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedImplicitTypesTransformerForIDE.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedImplicitTypesTransformer.kt index ddfdc625dc1..e3f8924c292 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedImplicitTypesTransformerForIDE.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedImplicitTypesTransformer.kt @@ -14,23 +14,23 @@ import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirTowerDataCo import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.ImplicitBodyResolveComputationSession import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.createReturnTypeCalculatorForIDE import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignationWithFile -import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FirIdeDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator +import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.LLFirDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveTreeBuilder -import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.FirLazyTransformerForIDE.Companion.updatePhaseDeep +import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirLazyTransformer.Companion.updatePhaseDeep import org.jetbrains.kotlin.analysis.low.level.api.fir.util.ensurePhase /** * Transform designation into IMPLICIT_TYPES_BODY_RESOLVE declaration. Affects only for target declaration, it's children and dependents */ -internal class FirDesignatedImplicitTypesTransformerForIDE( +internal class LLFirDesignatedImplicitTypesTransformer( private val designation: FirDeclarationDesignationWithFile, session: FirSession, scopeSession: ScopeSession, towerDataContextCollector: FirTowerDataContextCollector?, implicitBodyResolveComputationSession: ImplicitBodyResolveComputationSession = ImplicitBodyResolveComputationSession(), -) : FirLazyTransformerForIDE, FirImplicitAwareBodyResolveTransformer( +) : LLFirLazyTransformer, FirImplicitAwareBodyResolveTransformer( session, implicitBodyResolveComputationSession = implicitBodyResolveComputationSession, phase = FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, @@ -41,17 +41,17 @@ internal class FirDesignatedImplicitTypesTransformerForIDE( session, scopeSession, implicitBodyResolveComputationSession, - ::FirIdeDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator + ::LLFirDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator ) ) { - private val ideDeclarationTransformer = IDEDeclarationTransformer(designation) + private val ideDeclarationTransformer = LLFirDeclarationTransformer(designation) override fun transformDeclarationContent(declaration: FirDeclaration, data: ResolutionMode): FirDeclaration = ideDeclarationTransformer.transformDeclarationContent(this, declaration, data) { super.transformDeclarationContent(declaration, data) } - override fun transformDeclaration(phaseRunner: FirPhaseRunner) { + override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { if (designation.declaration.resolvePhase >= FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) return designation.declaration.ensurePhase(FirResolvePhase.CONTRACTS) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedStatusResolveTransformerForIDE.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedStatusResolveTransformer.kt similarity index 91% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedStatusResolveTransformerForIDE.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedStatusResolveTransformer.kt index 47b81f80447..6c62cfa88aa 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedStatusResolveTransformerForIDE.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedStatusResolveTransformer.kt @@ -11,24 +11,24 @@ import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.FirStatusResolveTransformer import org.jetbrains.kotlin.fir.resolve.transformers.StatusComputationSession -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignationWithFile import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveTreeBuilder -import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.FirLazyTransformerForIDE.Companion.updatePhaseDeep +import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirLazyTransformer.Companion.updatePhaseDeep import org.jetbrains.kotlin.analysis.low.level.api.fir.util.ensurePhase /** * Transform designation into STATUS phase. Affects only for designation, target declaration, it's children and dependents */ -internal class FirDesignatedStatusResolveTransformerForIDE( +internal class LLFirDesignatedStatusResolveTransformer( private val designation: FirDeclarationDesignationWithFile, private val session: FirSession, private val scopeSession: ScopeSession, -) : FirLazyTransformerForIDE { +) : LLFirLazyTransformer { private inner class FirDesignatedStatusResolveTransformerForIDE : FirStatusResolveTransformer(session, scopeSession, StatusComputationSession.Regular()) { - val designationTransformer = IDEDeclarationTransformer(designation) + val designationTransformer = LLFirDeclarationTransformer(designation) override fun transformDeclarationContent(declaration: FirDeclaration, data: FirResolvedDeclarationStatus?): FirDeclaration = designationTransformer.transformDeclarationContent(this, declaration, data) { @@ -36,7 +36,7 @@ internal class FirDesignatedStatusResolveTransformerForIDE( } } - override fun transformDeclaration(phaseRunner: FirPhaseRunner) { + override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { if (designation.declaration.resolvePhase >= FirResolvePhase.STATUS) return designation.declaration.ensurePhase(FirResolvePhase.TYPES) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedSupertypeResolverTransformerForIDE.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt similarity index 94% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedSupertypeResolverTransformerForIDE.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt index 8e1d1ebcbc2..1af89ee57e9 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedSupertypeResolverTransformerForIDE.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.* import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.toSymbol -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignation import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignationWithFile import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignation @@ -21,14 +21,14 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCa 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.ResolveTreeBuilder -import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.FirLazyTransformerForIDE.Companion.updatePhaseDeep +import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirLazyTransformer.Companion.updatePhaseDeep import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkCanceled import org.jetbrains.kotlin.analysis.low.level.api.fir.util.ensurePhase /** * Transform designation into SUPER_TYPES phase. Affects only for designation, target declaration, it's children and dependents */ -internal class FirDesignatedSupertypeResolverTransformerForIDE( +internal class LLFirDesignatedSupertypeResolverTransformer( private val designation: FirDeclarationDesignationWithFile, private val session: FirSession, private val scopeSession: ScopeSession, @@ -36,7 +36,7 @@ internal class FirDesignatedSupertypeResolverTransformerForIDE( private val firLazyDeclarationResolver: FirLazyDeclarationResolver, private val firProviderInterceptor: FirProviderInterceptor?, private val checkPCE: Boolean, -) : FirLazyTransformerForIDE { +) : LLFirLazyTransformer { private val supertypeComputationSession = SupertypeComputationSession() @@ -49,7 +49,7 @@ internal class FirDesignatedSupertypeResolverTransformerForIDE( localClassesNavigationInfo = null, firProviderInterceptor = firProviderInterceptor, ) { - val declarationTransformer = IDEDeclarationTransformer(classDesignation) + val declarationTransformer = LLFirDeclarationTransformer(classDesignation) override fun visitDeclarationContent(declaration: FirDeclaration, data: Any?) { declarationTransformer.visitDeclarationContent(this, declaration, data) { @@ -62,7 +62,7 @@ internal class FirDesignatedSupertypeResolverTransformerForIDE( private inner class DesignatedFirApplySupertypesTransformer(classDesignation: FirDeclarationDesignation) : FirApplySupertypesTransformer(supertypeComputationSession) { - val declarationTransformer = IDEDeclarationTransformer(classDesignation) + val declarationTransformer = LLFirDeclarationTransformer(classDesignation) override fun transformDeclarationContent(declaration: FirDeclaration, data: Any?): FirDeclaration { return declarationTransformer.transformDeclarationContent(this, declaration, data) { @@ -129,7 +129,7 @@ internal class FirDesignatedSupertypeResolverTransformerForIDE( } } - override fun transformDeclaration(phaseRunner: FirPhaseRunner) { + override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { if (designation.declaration.resolvePhase >= FirResolvePhase.SUPER_TYPES) return designation.firFile.ensurePhase(FirResolvePhase.IMPORTS) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedTypeResolverTransformerForIDE.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedTypeResolverTransformer.kt similarity index 90% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedTypeResolverTransformerForIDE.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedTypeResolverTransformer.kt index daf25f5865b..ea060717ea8 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirDesignatedTypeResolverTransformerForIDE.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedTypeResolverTransformer.kt @@ -12,22 +12,22 @@ import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.FirTypeResolveTransformer import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignationWithFile import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveTreeBuilder -import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.FirLazyTransformerForIDE.Companion.updatePhaseDeep +import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirLazyTransformer.Companion.updatePhaseDeep import org.jetbrains.kotlin.analysis.low.level.api.fir.util.ensurePhase /** * Transform designation into TYPES phase. Affects only for designation, target declaration and it's children */ -internal class FirDesignatedTypeResolverTransformerForIDE( +internal class LLFirDesignatedTypeResolverTransformer( private val designation: FirDeclarationDesignationWithFile, session: FirSession, scopeSession: ScopeSession, -) : FirLazyTransformerForIDE, FirTypeResolveTransformer(session, scopeSession) { +) : LLFirLazyTransformer, FirTypeResolveTransformer(session, scopeSession) { - private val declarationTransformer = IDEDeclarationTransformer(designation) + private val declarationTransformer = LLFirDeclarationTransformer(designation) override fun transformElement(element: E, data: Any?): E { return if (element is FirDeclaration && (element is FirRegularClass || element is FirFile)) { @@ -40,7 +40,7 @@ internal class FirDesignatedTypeResolverTransformerForIDE( } } - override fun transformDeclaration(phaseRunner: FirPhaseRunner) { + override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { if (designation.declaration.resolvePhase >= FirResolvePhase.TYPES) return designation.declaration.ensurePhase(FirResolvePhase.SUPER_TYPES) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirFileAnnotationsResolveTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirFileAnnotationsResolveTransformer.kt similarity index 86% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirFileAnnotationsResolveTransformer.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirFileAnnotationsResolveTransformer.kt index b41ca08f1bc..6cf7b938ab5 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirFileAnnotationsResolveTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirFileAnnotationsResolveTransformer.kt @@ -12,10 +12,10 @@ import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirBodyResolve import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirTowerDataContextCollector import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.ImplicitBodyResolveComputationSession import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.createReturnTypeCalculatorForIDE -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner -import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FirIdeDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner +import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.LLFirDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator -internal class FirFileAnnotationsResolveTransformer( +internal class LLFirFileAnnotationsResolveTransformer( private val firFile: FirFile, private val annotations: List, session: FirSession, @@ -31,10 +31,10 @@ internal class FirFileAnnotationsResolveTransformer( session, scopeSession, implicitBodyResolveComputationSession, - ::FirIdeDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator + ::LLFirDesignatedImpliciteTypesBodyResolveTransformerForReturnTypeCalculator ), firTowerDataContextCollector = firTowerDataContextCollector -), FirLazyTransformerForIDE { +), LLFirLazyTransformer { override fun transformDeclarationContent(declaration: FirDeclaration, data: ResolutionMode): FirDeclaration { require(declaration is FirFile) { "Unexpected declaration ${declaration::class.simpleName}" } @@ -46,7 +46,7 @@ internal class FirFileAnnotationsResolveTransformer( return declaration } - override fun transformDeclaration(phaseRunner: FirPhaseRunner) { + override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { if (annotations.all { it.resolved }) return check(firFile.resolvePhase >= FirResolvePhase.IMPORTS) { "Invalid file resolve phase ${firFile.resolvePhase}" } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirProviderInterceptorForIDE.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirFirProviderInterceptor.kt similarity index 91% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirProviderInterceptorForIDE.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirFirProviderInterceptor.kt index fcae1154001..9a52609b451 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirProviderInterceptorForIDE.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirFirProviderInterceptor.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid import org.jetbrains.kotlin.name.ClassId -internal class FirProviderInterceptorForIDE private constructor( +internal class LLFirFirProviderInterceptor private constructor( private val firFile: FirFile, private val session: FirSession, private val symbolSet: Set>, @@ -43,7 +43,7 @@ internal class FirProviderInterceptorForIDE private constructor( } nodeInfoCollector.visitElement(element) - return FirProviderInterceptorForIDE(firFile, session, nodeInfoCollector.symbolSet, nodeInfoCollector.classIdToElementMap) + return LLFirFirProviderInterceptor(firFile, session, nodeInfoCollector.symbolSet, nodeInfoCollector.classIdToElementMap) } } } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirLazyTransformerForIDE.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyTransformer.kt similarity index 86% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirLazyTransformerForIDE.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyTransformer.kt index af831157a6a..c20dd22eac3 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/FirLazyTransformerForIDE.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyTransformer.kt @@ -10,11 +10,10 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor import org.jetbrains.kotlin.fir.visitors.FirVisitor -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirPhaseRunner -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignation +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirPhaseRunner -internal interface FirLazyTransformerForIDE { - fun transformDeclaration(phaseRunner: FirPhaseRunner) +internal interface LLFirLazyTransformer { + fun transformDeclaration(phaseRunner: LLFirPhaseRunner) fun ensureResolved(declaration: FirDeclaration) fun ensureResolvedDeep(declaration: FirDeclaration) { if (!enableDeepEnsure) return @@ -64,8 +63,8 @@ internal interface FirLazyTransformerForIDE { internal var enableDeepEnsure: Boolean = false @TestOnly set - val DUMMY = object : FirLazyTransformerForIDE { - override fun transformDeclaration(phaseRunner: FirPhaseRunner) = Unit + val DUMMY = object : LLFirLazyTransformer { + override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) = Unit override fun ensureResolved(declaration: FirDeclaration) = error("Not implemented") } } 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 edea4b5df25..5fe12c2d6bb 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 @@ -23,9 +23,9 @@ internal object LazyTransformerFactory { towerDataContextCollector: FirTowerDataContextCollector?, firProviderInterceptor: FirProviderInterceptor?, checkPCE: Boolean, - ): FirLazyTransformerForIDE = when (phase) { - FirResolvePhase.SEALED_CLASS_INHERITORS -> FirLazyTransformerForIDE.DUMMY - FirResolvePhase.SUPER_TYPES -> FirDesignatedSupertypeResolverTransformerForIDE( + ): LLFirLazyTransformer = when (phase) { + FirResolvePhase.SEALED_CLASS_INHERITORS -> LLFirLazyTransformer.DUMMY + FirResolvePhase.SUPER_TYPES -> LLFirDesignatedSupertypeResolverTransformer( designation = designation, session = designation.firFile.moduleData.session, scopeSession = scopeSession, @@ -34,33 +34,33 @@ internal object LazyTransformerFactory { firProviderInterceptor = firProviderInterceptor, checkPCE = checkPCE, ) - FirResolvePhase.TYPES -> FirDesignatedTypeResolverTransformerForIDE( + FirResolvePhase.TYPES -> LLFirDesignatedTypeResolverTransformer( designation, designation.firFile.moduleData.session, scopeSession, ) - FirResolvePhase.STATUS -> FirDesignatedStatusResolveTransformerForIDE( + FirResolvePhase.STATUS -> LLFirDesignatedStatusResolveTransformer( designation, designation.firFile.moduleData.session, scopeSession, ) - FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS -> FirDesignatedAnnotationArgumentsResolveTransformerForIDE( + FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS -> LLFirDesignatedAnnotationArgumentsResolveTransformer( designation, designation.firFile.moduleData.session, scopeSession, ) - FirResolvePhase.CONTRACTS -> FirDesignatedContractsResolveTransformerForIDE( + FirResolvePhase.CONTRACTS -> LLFirDesignatedContractsResolveTransformer( designation, designation.firFile.moduleData.session, scopeSession, ) - FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE -> FirDesignatedImplicitTypesTransformerForIDE( + FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE -> LLFirDesignatedImplicitTypesTransformer( designation, designation.firFile.moduleData.session, scopeSession, towerDataContextCollector ) - FirResolvePhase.BODY_RESOLVE -> FirDesignatedBodyResolveTransformerForIDE( + FirResolvePhase.BODY_RESOLVE -> LLFirDesignatedBodyResolveTransformer( designation, designation.firFile.moduleData.session, scopeSession, diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt index 88cf621e4e8..5c1ebeee05d 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir -import org.jetbrains.kotlin.analysis.low.level.api.fir.state.FirSourceModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.state.LLFirSourceModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLevelApiSingleFileTest import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirRenderer @@ -54,7 +54,7 @@ abstract class AbstractFirLazyDeclarationResolveTest : AbstractLowLevelApiSingle val rendererOption = FirRenderer.RenderMode.WithDeclarationAttributes.copy(renderDeclarationResolvePhase = true) val resultBuilder = StringBuilder() resolveWithClearCaches(ktFile) { firModuleResolveState -> - check(firModuleResolveState is FirSourceModuleResolveState) + check(firModuleResolveState is LLFirSourceModuleResolveState) val declarationToResolve = firModuleResolveState .getOrBuildFirFile(ktFile) .findResolveMe() @@ -68,7 +68,7 @@ abstract class AbstractFirLazyDeclarationResolveTest : AbstractLowLevelApiSingle } resolveWithClearCaches(ktFile) { firModuleResolveState -> - check(firModuleResolveState is FirSourceModuleResolveState) + check(firModuleResolveState is LLFirSourceModuleResolveState) val firFile = firModuleResolveState.getOrBuildFirFile(ktFile) firFile.ensureResolved(FirResolvePhase.BODY_RESOLVE) resultBuilder.append("\nFILE RAW TO BODY:\n") diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirOnAirResolveTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirOnAirResolveTest.kt index b25ede9f80f..4bbe9037b5c 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirOnAirResolveTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirOnAirResolveTest.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LowLevelFirApiFacadeForResolveOnAir -import org.jetbrains.kotlin.analysis.low.level.api.fir.state.FirSourceModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.state.LLFirSourceModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLevelApiSingleFileTest import org.jetbrains.kotlin.fir.FirRenderer import org.jetbrains.kotlin.fir.render @@ -33,7 +33,7 @@ abstract class AbstractFirOnAirResolveTest : AbstractLowLevelApiSingleFileTest() check(place::class == onAir::class) resolveWithClearCaches(ktFile) { resolveState -> - check(resolveState is FirSourceModuleResolveState) + check(resolveState is LLFirSourceModuleResolveState) val firElement = LowLevelFirApiFacadeForResolveOnAir.onAirResolveElement(resolveState, place, onAir) val rendered = firElement.render(FirRenderer.RenderMode.WithResolvePhases) testServices.assertions.assertEqualsToTestDataFileSibling(rendered) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt index d5722cbbcd2..4fa45e28482 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt @@ -12,8 +12,7 @@ import org.jetbrains.kotlin.analysis.api.impl.barebone.test.projectModuleProvide import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile import org.jetbrains.kotlin.analysis.low.level.api.fir.createResolveStateForNoCaching -import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.FirLazyTransformerForIDE -import org.jetbrains.kotlin.analysis.project.structure.KtModule +import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirLazyTransformer import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.test.bind import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder @@ -82,12 +81,12 @@ abstract class AbstractCompilerBasedTestForFir : AbstractCompilerBasedTest() { if (ignoreTest(filePath, configuration)) { return } - val oldEnableDeepEnsure = FirLazyTransformerForIDE.enableDeepEnsure + val oldEnableDeepEnsure = LLFirLazyTransformer.enableDeepEnsure try { - FirLazyTransformerForIDE.enableDeepEnsure = true + LLFirLazyTransformer.enableDeepEnsure = true super.runTest(filePath) } finally { - FirLazyTransformerForIDE.enableDeepEnsure = oldEnableDeepEnsure + LLFirLazyTransformer.enableDeepEnsure = oldEnableDeepEnsure } } } \ No newline at end of file diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt index 66da4c2fdd2..7590f1195a0 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDiagnosticsForFile import org.jetbrains.kotlin.fir.analysis.AbstractFirAnalyzerFacade import org.jetbrains.kotlin.diagnostics.KtDiagnostic @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi2ir.generators.GeneratorExtensions import org.jetbrains.kotlin.test.model.TestFile class LowLevelFirAnalyzerFacade( - val resolveState: FirModuleResolveState, + val resolveState: LLFirModuleResolveState, val allFirFiles: Map, private val diagnosticCheckerFilter: DiagnosticCheckerFilter, ) : AbstractFirAnalyzerFacade() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/testServices.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/testServices.kt index 262b46e4f63..efc6a76510a 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/testServices.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/testServices.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.analysis.api.InvalidWayOfUsingAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSessionProvider import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSessionProvider import org.jetbrains.kotlin.analysis.api.impl.barebone.test.projectModuleProvider -import org.jetbrains.kotlin.analysis.low.level.api.fir.FirIdeResolveStateService +import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirResolveStateService import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.FirSealedClassInheritorsProcessorFactory import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.PackagePartProviderFactory import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.SealedClassInheritorsProviderTestImpl @@ -53,7 +53,7 @@ fun MockProject.registerTestServices( FirSealedClassInheritorsProcessorFactoryTestImpl() ) registerService(KtModuleScopeProvider::class.java, KtModuleScopeProviderImpl()) - registerService(FirIdeResolveStateService::class.java) + registerService(LLFirResolveStateService::class.java) registerService( KotlinModificationTrackerFactory::class.java, KotlinStaticModificationTrackerFactory::class.java diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractFirContextCollectionTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractFirContextCollectionTest.kt index 373d16701ee..54a7e779e4f 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractFirContextCollectionTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractFirContextCollectionTest.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.resolve.ImplicitReceiverStack import org.jetbrains.kotlin.fir.resolve.SessionHolderImpl -import org.jetbrains.kotlin.analysis.low.level.api.fir.state.FirSourceModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.state.LLFirSourceModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getDiagnostics import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile @@ -41,7 +41,7 @@ abstract class AbstractFirContextCollectionTest : AbstractLowLevelApiSingleFileT register(BeforeElementDiagnosticCollectionHandler::class, handler) } ) { resolveState -> - check(resolveState is FirSourceModuleResolveState) + check(resolveState is LLFirSourceModuleResolveState) val fileStructure = resolveState.fileStructureCache.getFileStructure(ktFile, resolveState.cache) val allStructureElements = fileStructure.getAllStructureElements() diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractFileStructureTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractFileStructureTest.kt index 6451de08ec1..989b1e9cd30 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractFileStructureTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractFileStructureTest.kt @@ -9,7 +9,7 @@ import com.intellij.psi.PsiComment import com.intellij.psi.PsiElement import com.intellij.psi.PsiElementVisitor import com.intellij.psi.impl.source.tree.LeafPsiElement -import org.jetbrains.kotlin.analysis.low.level.api.fir.state.FirSourceModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.state.LLFirSourceModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLevelApiSingleFileTest import org.jetbrains.kotlin.psi.* @@ -85,7 +85,7 @@ abstract class AbstractFileStructureTest : AbstractLowLevelApiSingleFileTest() { } private fun KtFile.getFileStructure(): FileStructure { - val moduleResolveState = getResolveState() as FirSourceModuleResolveState + val moduleResolveState = getResolveState() as LLFirSourceModuleResolveState return moduleResolveState.fileStructureCache.getFileStructure( ktFile = this, moduleFileCache = moduleResolveState.cache diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/firTestUtils.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/firTestUtils.kt index 195c16383d6..e6ae683ac42 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/firTestUtils.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/firTestUtils.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousInitializerSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession import org.jetbrains.kotlin.analysis.project.structure.getKtModule import org.jetbrains.kotlin.psi.KtElement @@ -36,8 +36,8 @@ internal fun FirDeclaration.name(): String = symbol.name() internal inline fun resolveWithClearCaches( context: KtElement, - noinline configureSession: FirIdeSession.() -> Unit = {}, - action: (FirModuleResolveState) -> R, + noinline configureSession: LLFirSession.() -> Unit = {}, + action: (LLFirModuleResolveState) -> R, ): R { val project = context.project val resolveState = createResolveStateForNoCaching(context.getKtModule(project), project, configureSession)