From a08e70ae5cb7695318bae0313a5ef5cff6977633 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 2 Feb 2022 13:48:28 +0100
Subject: [PATCH] FIR CLI: fix java sources search scope usage

---
 .../kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt  | 2 +-
 .../org/jetbrains/kotlin/fir/session/FirSessionFactory.kt | 8 ++++----
 .../kotlin/fir/AbstractFirBaseDiagnosticsTest.kt          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
index 8f8613c3b08..6bb4f628be9 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
@@ -397,7 +397,7 @@ fun createSession(
         externalSessionProvider = sessionProvider,
         projectEnvironment,
         moduleConfiguration.languageVersionSettings,
-        sourceScope,
+        projectEnvironment.getSearchScopeForProjectJavaSources(),
         librariesScope,
         lookupTracker = moduleConfiguration.get(CommonConfigurationKeys.LOOKUP_TRACKER),
         providerAndScopeForIncrementalCompilation,
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt
index b35060f5864..7e6d5b29420 100644
--- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt
+++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt
@@ -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,
                     )
                 )
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
index 6405ccd4a96..a64eb0651f8 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
@@ -94,7 +94,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
                     { environment.createPackagePartProvider(it) }
                 ),
                 config?.languageVersionSettings ?: LanguageVersionSettingsImpl.DEFAULT,
-                sourceScope = PsiBasedProjectFileSearchScope(scope),
+                javaSourcesScope = PsiBasedProjectFileSearchScope(scope),
                 librariesScope = PsiBasedProjectFileSearchScope(allProjectScope),
                 lookupTracker = null,
                 incrementalCompilationContext = null,