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

FIR CLI: fix java sources search scope usage

Browse Source
This commit is contained in:
Ilya Chernikov
2022-02-02 13:48:28 +01:00
committed by teamcity
parent 0df3fde37f
commit a08e70ae5c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt
+4 -4
View File
@@ -84,7 +84,7 @@ object FirSessionFactory {
externalSessionProvider: FirProjectSessionProvider?,
projectEnvironment: AbstractProjectEnvironment,
languageVersionSettings: LanguageVersionSettings,
sourceScope: AbstractProjectFileSearchScope,
javaSourcesScope: AbstractProjectFileSearchScope,
librariesScope: AbstractProjectFileSearchScope,
lookupTracker: LookupTracker?,
incrementalCompilationContext: IncrementalCompilationContext?,
@@ -116,7 +116,7 @@ object FirSessionFactory {
return createJavaModuleBasedSession(
mainModuleData,
sessionProvider,
sourceScope,
javaSourcesScope,
projectEnvironment,
incrementalCompilationContext,
extensionRegistrars,
@@ -130,7 +130,7 @@ object FirSessionFactory {
fun createJavaModuleBasedSession(
moduleData: FirModuleData,
sessionProvider: FirProjectSessionProvider,
scope: AbstractProjectFileSearchScope,
javaSourcesScope: AbstractProjectFileSearchScope,
projectEnvironment: AbstractProjectEnvironment,
incrementalCompilationContext: IncrementalCompilationContext?,
extensionRegistrars: List<FirExtensionRegistrar>,
@@ -189,7 +189,7 @@ object FirSessionFactory {
*(incrementalCompilationContext?.previousFirSessionsSymbolProviders?.toTypedArray() ?: emptyArray()),
symbolProviderForBinariesFromIncrementalCompilation,
generatedSymbolsProvider,
JavaSymbolProvider(this, projectEnvironment.getFirJavaFacade(this, moduleData, scope)),
JavaSymbolProvider(this, projectEnvironment.getFirJavaFacade(this, moduleData, javaSourcesScope)),
dependenciesSymbolProvider,
)
)