From 4d938e93c65b12ae6e0f46b9c4f82e9f592a180d Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Wed, 2 Mar 2022 22:46:24 -0800 Subject: [PATCH] FIR LC: remove IDE prefix from FIR version of KotlinAsJavaSupport since it's used in standalone mode as well --- .../kotlin/analysis/api/standalone/StandaloneModeUtils.kt | 7 ++++--- .../low/level/api/fir/compiler/based/testServices.kt | 4 ++-- ...KotlinAsJavaFirSupport.kt => KotlinAsJavaFirSupport.kt} | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) rename analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/{IDEKotlinAsJavaFirSupport.kt => KotlinAsJavaFirSupport.kt} (98%) diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeUtils.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeUtils.kt index 51e0a7140e6..8f1ee280f35 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeUtils.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeUtils.kt @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProvider import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProviderImpl import org.jetbrains.kotlin.idea.references.KotlinFirReferenceContributor import org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor -import org.jetbrains.kotlin.light.classes.symbol.IDEKotlinAsJavaFirSupport +import org.jetbrains.kotlin.light.classes.symbol.KotlinAsJavaFirSupport import org.jetbrains.kotlin.light.classes.symbol.caches.SymbolLightClassFacadeCache import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.psi.KotlinReferenceProvidersService @@ -74,9 +74,10 @@ public fun configureApplicationEnvironment(app: MockApplication) { * * In particular, this will register: * * [KtAnalysisSessionProvider] - * * [KotlinAsJavaSupport] (a FIR version) + * * [KotlinAsJavaFirSupport] * * [SymbolLightClassFacadeCache] for FIR light class support * * [KotlinModificationTrackerFactory] + * * [KotlinAnnotationsResolverFactory] * * [LLFirResolveStateService] * * [FirSealedClassInheritorsProcessorFactory] * * [KtModuleScopeProvider] @@ -213,7 +214,7 @@ private fun reRegisterJavaElementFinder(project: Project) { picoContainer.unregisterComponent(KotlinAsJavaSupport::class.qualifiedName) picoContainer.registerComponentInstance( KotlinAsJavaSupport::class.qualifiedName, - IDEKotlinAsJavaFirSupport(project) + KotlinAsJavaFirSupport(project) ) } @Suppress("DEPRECATION") 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 c496da38a1c..9a3916ea733 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 @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProvider import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProviderImpl -import org.jetbrains.kotlin.light.classes.symbol.IDEKotlinAsJavaFirSupport +import org.jetbrains.kotlin.light.classes.symbol.KotlinAsJavaFirSupport import org.jetbrains.kotlin.light.classes.symbol.caches.SymbolLightClassFacadeCache import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.psi.KtFile @@ -87,7 +87,7 @@ private fun reRegisterJavaElementFinder(project: Project) { picoContainer.unregisterComponent(KotlinAsJavaSupport::class.qualifiedName) picoContainer.registerComponentInstance( KotlinAsJavaSupport::class.qualifiedName, - IDEKotlinAsJavaFirSupport(project) + KotlinAsJavaFirSupport(project) ) } @Suppress("DEPRECATION") diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/IDEKotlinAsJavaFirSupport.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/KotlinAsJavaFirSupport.kt similarity index 98% rename from analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/IDEKotlinAsJavaFirSupport.kt rename to analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/KotlinAsJavaFirSupport.kt index 7d4c5c6dbcf..02aabba806e 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/IDEKotlinAsJavaFirSupport.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/KotlinAsJavaFirSupport.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtScript -class IDEKotlinAsJavaFirSupport(private val project: Project) : KotlinAsJavaSupport() { +class KotlinAsJavaFirSupport(private val project: Project) : KotlinAsJavaSupport() { override fun findClassOrObjectDeclarationsInPackage( packageFqName: FqName, searchScope: GlobalSearchScope @@ -146,4 +146,4 @@ private fun KtElement.isFromSourceOrLibraryBinary(project: Project): Boolean { is KtLibraryModule -> true else -> false } -} \ No newline at end of file +}