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

FIR: Rename KotlinDeserializedJvmSymbolsProvider -> JvmClassFileBasedSymbolProvider

Browse Source
This commit is contained in:
Denis.Zharkov
2021-09-15 17:33:44 +03:00
committed by TeamCityServer
parent 0aa8181960
commit 37785eb244
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/FirIdeSessionFactory.kt
+4 -3
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProvider
import org.jetbrains.kotlin.fir.deserialization.ModuleDataProvider
import org.jetbrains.kotlin.fir.java.FirJavaFacade
import org.jetbrains.kotlin.fir.java.JavaSymbolProvider
import org.jetbrains.kotlin.fir.java.deserialization.KotlinDeserializedJvmSymbolsProvider
import org.jetbrains.kotlin.fir.java.deserialization.JvmClassFileBasedSymbolProvider
import org.jetbrains.kotlin.fir.resolve.providers.FirDependenciesSymbolProvider
import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
@@ -184,7 +184,7 @@ internal object FirIdeSessionFactory {
val mainModuleData = KtModuleBasedModuleData(sourceModule).apply { bindSession(this@session) }
val kotlinSymbolProvider = KotlinDeserializedJvmSymbolsProvider(
val classFileBasedSymbolProvider = JvmClassFileBasedSymbolProvider(
this@session,
moduleDataProvider = createModuleDataProvider(sourceModule, this),
kotlinScopeProvider = FirKotlinScopeProvider(::wrapScopeWithJvmMapped),
@@ -194,7 +194,8 @@ internal object FirIdeSessionFactory {
this@session, mainModuleData, project.createJavaClassFinder(searchScope)
)
)
val symbolProvider = FirCompositeSymbolProvider(this, listOf(kotlinSymbolProvider, builtinsAndCloneableSession.symbolProvider))
val symbolProvider =
FirCompositeSymbolProvider(this, listOf(classFileBasedSymbolProvider, builtinsAndCloneableSession.symbolProvider))
register(FirProvider::class, FirIdeLibrariesSessionProvider(symbolProvider))
register(FirSymbolProvider::class, symbolProvider)
register(FirJvmTypeMapper::class, FirJvmTypeMapper(this))