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

FIR: Minor. Rename JavaClassConverter -> FirJavaFacade

Browse Source
This commit is contained in:
Denis.Zharkov
2021-09-14 12:54:50 +03:00
committed by TeamCityServer
parent 9902d36d57
commit 54a97a860a
8 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt
+3 -3
View File
@@ -153,7 +153,7 @@ object FirSessionFactory {
kotlinScopeProvider,
it.packagePartProvider,
projectEnvironment.getKotlinClassFinder(it.scope),
projectEnvironment.getJavaClassConverter(this, moduleData, it.scope),
projectEnvironment.getFirJavaFacade(this, moduleData, it.scope),
)
}
@@ -165,7 +165,7 @@ object FirSessionFactory {
listOfNotNull(
firProvider.symbolProvider,
symbolProviderForBinariesFromIncrementalCompilation,
JavaSymbolProvider(this, projectEnvironment.getJavaClassConverter(this, moduleData, scope)),
JavaSymbolProvider(this, projectEnvironment.getFirJavaFacade(this, moduleData, scope)),
dependenciesSymbolProvider,
)
)
@@ -213,7 +213,7 @@ object FirSessionFactory {
kotlinScopeProvider,
packagePartProvider,
projectEnvironment.getKotlinClassFinder(scope),
projectEnvironment.getJavaClassConverter(this, moduleDataProvider.allModuleData.last(), scope)
projectEnvironment.getFirJavaFacade(this, moduleDataProvider.allModuleData.last(), scope)
)
val builtinsModuleData = createModuleDataForBuiltins(
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/environment/AbstractProjectEnvironment.kt
+3 -3
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.session.environment
import org.jetbrains.kotlin.fir.FirModuleData
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.java.JavaClassConverter
import org.jetbrains.kotlin.fir.java.FirJavaFacade
import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder
import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleResolver
@@ -53,9 +53,9 @@ interface AbstractProjectEnvironment {
fun getSearchScopeForProjectJavaSources(): AbstractProjectFileSearchScope
fun getJavaClassConverter(
fun getFirJavaFacade(
firSession: FirSession,
baseModuleData: FirModuleData,
fileSearchScope: AbstractProjectFileSearchScope
): JavaClassConverter
): FirJavaFacade
}