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

FIR LC: remove IDE prefix from FIR version of KotlinAsJavaSupport

Browse Source 
since it's used in standalone mode as well
This commit is contained in:
Jinseong Jeon
2022-03-02 22:46:24 -08:00
committed by Ilya Kirillov
parent 25a06bdc56
commit 4d938e93c6
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeUtils.kt
+4 -3
View File
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProvider
import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProviderImpl import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProviderImpl
import org.jetbrains.kotlin.idea.references.KotlinFirReferenceContributor import org.jetbrains.kotlin.idea.references.KotlinFirReferenceContributor
import org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor 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.light.classes.symbol.caches.SymbolLightClassFacadeCache
import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
import org.jetbrains.kotlin.psi.KotlinReferenceProvidersService import org.jetbrains.kotlin.psi.KotlinReferenceProvidersService
@@ -74,9 +74,10 @@ public fun configureApplicationEnvironment(app: MockApplication) {
* *
* In particular, this will register: * In particular, this will register:
* * [KtAnalysisSessionProvider] * * [KtAnalysisSessionProvider]
* * [KotlinAsJavaSupport] (a FIR version) * * [KotlinAsJavaFirSupport]
* * [SymbolLightClassFacadeCache] for FIR light class support * * [SymbolLightClassFacadeCache] for FIR light class support
* * [KotlinModificationTrackerFactory] * * [KotlinModificationTrackerFactory]
* * [KotlinAnnotationsResolverFactory]
* * [LLFirResolveStateService] * * [LLFirResolveStateService]
* * [FirSealedClassInheritorsProcessorFactory] * * [FirSealedClassInheritorsProcessorFactory]
* * [KtModuleScopeProvider] * * [KtModuleScopeProvider]
@@ -213,7 +214,7 @@ private fun reRegisterJavaElementFinder(project: Project) {
picoContainer.unregisterComponent(KotlinAsJavaSupport::class.qualifiedName) picoContainer.unregisterComponent(KotlinAsJavaSupport::class.qualifiedName)
picoContainer.registerComponentInstance( picoContainer.registerComponentInstance(
KotlinAsJavaSupport::class.qualifiedName, KotlinAsJavaSupport::class.qualifiedName,
IDEKotlinAsJavaFirSupport(project) KotlinAsJavaFirSupport(project)
) )
} }
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/testServices.kt
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProvider import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProvider
import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProviderImpl 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.light.classes.symbol.caches.SymbolLightClassFacadeCache
import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -87,7 +87,7 @@ private fun reRegisterJavaElementFinder(project: Project) {
picoContainer.unregisterComponent(KotlinAsJavaSupport::class.qualifiedName) picoContainer.unregisterComponent(KotlinAsJavaSupport::class.qualifiedName)
picoContainer.registerComponentInstance( picoContainer.registerComponentInstance(
KotlinAsJavaSupport::class.qualifiedName, KotlinAsJavaSupport::class.qualifiedName,
IDEKotlinAsJavaFirSupport(project) KotlinAsJavaFirSupport(project)
) )
} }
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/IDEKotlinAsJavaFirSupport.kt → analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/KotlinAsJavaFirSupport.kt
+2 -2
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtScript import org.jetbrains.kotlin.psi.KtScript
class IDEKotlinAsJavaFirSupport(private val project: Project) : KotlinAsJavaSupport() { class KotlinAsJavaFirSupport(private val project: Project) : KotlinAsJavaSupport() {
override fun findClassOrObjectDeclarationsInPackage( override fun findClassOrObjectDeclarationsInPackage(
packageFqName: FqName, packageFqName: FqName,
searchScope: GlobalSearchScope searchScope: GlobalSearchScope
@@ -146,4 +146,4 @@ private fun KtElement.isFromSourceOrLibraryBinary(project: Project): Boolean {
is KtLibraryModule -> true is KtLibraryModule -> true
else -> false else -> false
} }
} }