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/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
+1 -1
View File
@@ -397,7 +397,7 @@ fun createSession(
externalSessionProvider = sessionProvider, externalSessionProvider = sessionProvider,
projectEnvironment, projectEnvironment,
moduleConfiguration.languageVersionSettings, moduleConfiguration.languageVersionSettings,
sourceScope, projectEnvironment.getSearchScopeForProjectJavaSources(),
librariesScope, librariesScope,
lookupTracker = moduleConfiguration.get(CommonConfigurationKeys.LOOKUP_TRACKER), lookupTracker = moduleConfiguration.get(CommonConfigurationKeys.LOOKUP_TRACKER),
providerAndScopeForIncrementalCompilation, providerAndScopeForIncrementalCompilation,
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt
+4 -4
View File
@@ -84,7 +84,7 @@ object FirSessionFactory {
externalSessionProvider: FirProjectSessionProvider?, externalSessionProvider: FirProjectSessionProvider?,
projectEnvironment: AbstractProjectEnvironment, projectEnvironment: AbstractProjectEnvironment,
languageVersionSettings: LanguageVersionSettings, languageVersionSettings: LanguageVersionSettings,
sourceScope: AbstractProjectFileSearchScope, javaSourcesScope: AbstractProjectFileSearchScope,
librariesScope: AbstractProjectFileSearchScope, librariesScope: AbstractProjectFileSearchScope,
lookupTracker: LookupTracker?, lookupTracker: LookupTracker?,
incrementalCompilationContext: IncrementalCompilationContext?, incrementalCompilationContext: IncrementalCompilationContext?,
@@ -116,7 +116,7 @@ object FirSessionFactory {
return createJavaModuleBasedSession( return createJavaModuleBasedSession(
mainModuleData, mainModuleData,
sessionProvider, sessionProvider,
sourceScope, javaSourcesScope,
projectEnvironment, projectEnvironment,
incrementalCompilationContext, incrementalCompilationContext,
extensionRegistrars, extensionRegistrars,
@@ -130,7 +130,7 @@ object FirSessionFactory {
fun createJavaModuleBasedSession( fun createJavaModuleBasedSession(
moduleData: FirModuleData, moduleData: FirModuleData,
sessionProvider: FirProjectSessionProvider, sessionProvider: FirProjectSessionProvider,
scope: AbstractProjectFileSearchScope, javaSourcesScope: AbstractProjectFileSearchScope,
projectEnvironment: AbstractProjectEnvironment, projectEnvironment: AbstractProjectEnvironment,
incrementalCompilationContext: IncrementalCompilationContext?, incrementalCompilationContext: IncrementalCompilationContext?,
extensionRegistrars: List<FirExtensionRegistrar>, extensionRegistrars: List<FirExtensionRegistrar>,
@@ -189,7 +189,7 @@ object FirSessionFactory {
*(incrementalCompilationContext?.previousFirSessionsSymbolProviders?.toTypedArray() ?: emptyArray()), *(incrementalCompilationContext?.previousFirSessionsSymbolProviders?.toTypedArray() ?: emptyArray()),
symbolProviderForBinariesFromIncrementalCompilation, symbolProviderForBinariesFromIncrementalCompilation,
generatedSymbolsProvider, generatedSymbolsProvider,
JavaSymbolProvider(this, projectEnvironment.getFirJavaFacade(this, moduleData, scope)), JavaSymbolProvider(this, projectEnvironment.getFirJavaFacade(this, moduleData, javaSourcesScope)),
dependenciesSymbolProvider, dependenciesSymbolProvider,
) )
) )
compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
+1 -1
View File
@@ -94,7 +94,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
{ environment.createPackagePartProvider(it) } { environment.createPackagePartProvider(it) }
), ),
config?.languageVersionSettings ?: LanguageVersionSettingsImpl.DEFAULT, config?.languageVersionSettings ?: LanguageVersionSettingsImpl.DEFAULT,
sourceScope = PsiBasedProjectFileSearchScope(scope), javaSourcesScope = PsiBasedProjectFileSearchScope(scope),
librariesScope = PsiBasedProjectFileSearchScope(allProjectScope), librariesScope = PsiBasedProjectFileSearchScope(allProjectScope),
lookupTracker = null, lookupTracker = null,
incrementalCompilationContext = null, incrementalCompilationContext = null,