[lc] introduce KotlinAsJavaSupportBase with new common facade logic

^KT-53543
This commit is contained in:
Dmitry Gridin
2022-08-11 15:55:58 +02:00
committed by Space
parent 0ea041a1eb
commit 924dd38144
22 changed files with 206 additions and 329 deletions
@@ -47,7 +47,6 @@ import org.jetbrains.kotlin.idea.references.KotlinFirReferenceContributor
import org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor
import org.jetbrains.kotlin.idea.references.ReadWriteAccessChecker
import org.jetbrains.kotlin.light.classes.symbol.SymbolKotlinAsJavaSupport
import org.jetbrains.kotlin.light.classes.symbol.caches.SymbolLightClassFacadeCache
import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
import org.jetbrains.kotlin.psi.KotlinReferenceProvidersService
import org.jetbrains.kotlin.psi.KtFile
@@ -150,7 +149,6 @@ public class StandaloneAnalysisAPISessionBuilder(
}
)
registerService(SymbolLightClassFacadeCache::class.java, SymbolLightClassFacadeCache(this))
registerService(ClsJavaStubByVirtualFileCache::class.java, ClsJavaStubByVirtualFileCache())
registerService(KotlinAsJavaSupport::class.java, SymbolKotlinAsJavaSupport(this))
registerService(ReadWriteAccessChecker::class.java, ReadWriteAccessCheckerFirImpl())
@@ -33,7 +33,6 @@ 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.SymbolKotlinAsJavaSupport
import org.jetbrains.kotlin.light.classes.symbol.caches.SymbolLightClassFacadeCache
import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
import org.jetbrains.kotlin.psi.KotlinReferenceProvidersService
import org.jetbrains.kotlin.psi.KtFile
@@ -70,7 +69,6 @@ public fun configureApplicationEnvironment(app: MockApplication) {
* In particular, this will register:
* * [KtAnalysisSessionProvider]
* * [SymbolKotlinAsJavaSupport]
* * [SymbolLightClassFacadeCache] for FIR light class support
* * [ClsJavaStubByVirtualFileCache]
* * [KotlinModificationTrackerFactory]
* * [KotlinAnnotationsResolverFactory]
@@ -114,10 +112,6 @@ internal fun configureProjectEnvironment(
)
// FIR LC
project.registerService(
SymbolLightClassFacadeCache::class.java,
SymbolLightClassFacadeCache(project)
)
project.registerService(
ClsJavaStubByVirtualFileCache::class.java,
ClsJavaStubByVirtualFileCache()