[FIR] Cleanup IC provider creation in FirSessionFactory

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt

@@ -90,6 +90,15 @@ object FirKotlinToJvmBytecodeCompiler {
 
             val librariesScope = ProjectScope.getLibrariesScope(project)
 
+            val providerAndScopeForIncrementalCompilation = run {
+                if (targetIds == null || incrementalComponents == null) return@run null
+                val packagePartProvider = IncrementalPackagePartProvider(
+                    environment.createPackagePartProvider(sourceScope),
+                    targetIds.map(incrementalComponents::getIncrementalCache)
+                )
+                FirSessionFactory.ProviderAndScopeForIncrementalCompilation(packagePartProvider, librariesScope)
+            }
+
             val languageVersionSettings = moduleConfiguration.languageVersionSettings
             val session = createSessionWithDependencies(
                 Name.identifier(module.getModuleName()),
@@ -101,15 +110,8 @@ object FirKotlinToJvmBytecodeCompiler {
                 sourceScope,
                 librariesScope,
                 lookupTracker = environment.configuration.get(CommonConfigurationKeys.LOOKUP_TRACKER),
+                providerAndScopeForIncrementalCompilation,
                 getPackagePartProvider = { environment.createPackagePartProvider(it) },
-                getProviderAndScopeForIncrementalCompilation = get@{
-                    if (targetIds == null || incrementalComponents == null) return@get null
-                    val packagePartProvider = IncrementalPackagePartProvider(
-                        environment.createPackagePartProvider(sourceScope),
-                        targetIds.map(incrementalComponents::getIncrementalCache)
-                    )
-                    FirSessionFactory.ProviderAndScopeForIncrementalCompilation(packagePartProvider, librariesScope)
-                },
                 dependenciesConfigurator = {
                     dependencies(moduleConfiguration.jvmClasspathRoots.map { it.toPath() })
                     friendDependencies(moduleConfiguration[JVMConfigurationKeys.FRIEND_PATHS] ?: emptyList())

compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt

@@ -84,8 +84,8 @@ object FirSessionFactory {
         sourceScope: GlobalSearchScope,
         librariesScope: GlobalSearchScope,
         lookupTracker: LookupTracker?,
+        providerAndScopeForIncrementalCompilation: ProviderAndScopeForIncrementalCompilation?,
         getPackagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
-        getProviderAndScopeForIncrementalCompilation: () -> ProviderAndScopeForIncrementalCompilation?,
         dependenciesConfigurator: DependencyListForCliModule.Builder.() -> Unit = {},
         noinline sessionConfigurator: FirSessionConfigurator.() -> Unit = {},
     ): FirSession {
@@ -113,7 +113,7 @@ object FirSessionFactory {
             sessionProvider,
             sourceScope,
             project,
-            providerAndScopeForIncrementalCompilation = getProviderAndScopeForIncrementalCompilation(),
+            providerAndScopeForIncrementalCompilation,
             languageVersionSettings = languageVersionSettings,
             lookupTracker = lookupTracker,
             init = sessionConfigurator

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt

@@ -76,8 +76,8 @@ class FirFrontendFacade(
             sourcesScope,
             librariesScope,
             lookupTracker = null,
+            providerAndScopeForIncrementalCompilation = null,
             getPackagePartProvider = packagePartProviderFactory,
-            getProviderAndScopeForIncrementalCompilation = { null },
             dependenciesConfigurator = {
                 dependencies(configuration.jvmModularRoots.map { it.toPath() })
                 dependencies(configuration.jvmClasspathRoots.map { it.toPath() })

compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt

@@ -90,8 +90,8 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
                 sourceScope = scope,
                 librariesScope = allProjectScope,
                 lookupTracker = null,
+                providerAndScopeForIncrementalCompilation = null,
                 getPackagePartProvider = { environment.createPackagePartProvider(it) },
-                getProviderAndScopeForIncrementalCompilation = { null },
             ) {
                 configureSession()
                 getFirExtensions()?.let {

compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt

@@ -52,8 +52,8 @@ fun createSessionForTests(
         sourceScope,
         librariesScope,
         lookupTracker = null,
+        providerAndScopeForIncrementalCompilation = null,
         getPackagePartProvider,
-        getProviderAndScopeForIncrementalCompilation = { null },
         dependenciesConfigurator = {
             friendDependencies(friendsPaths)
         }