FIR: Add IncrementalPackagePartsProvider usage in cli...

also refactor IncrementalPackagePartsProvider and parents to simplify
usage

compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt

@@ -104,7 +104,7 @@ object GenerationUtils {
         val scope = GlobalSearchScope.filesScope(project, files.map { it.virtualFile })
             .uniteWith(TopDownAnalyzerFacadeForJVM.AllJavaSourcesInProjectScope(project))
         val librariesScope = ProjectScope.getLibrariesScope(project)
-        val session = createSessionForTests(project, scope, librariesScope, "main", packagePartProvider = packagePartProvider)
+        val session = createSessionForTests(project, scope, librariesScope, "main", getPackagePartProvider = packagePartProvider)
 
         // TODO: add running checkers and check that it's safe to compile
         val firAnalyzerFacade = FirAnalyzerFacade(session, configuration.languageVersionSettings, files)

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

@@ -37,7 +37,8 @@ fun createSessionForTests(
     moduleName: String = "TestModule",
     friendPaths: List<String> = emptyList(),
     lookupTracker: LookupTracker? = null,
-    packagePartProvider: (GlobalSearchScope) -> PackagePartProvider
+    getPackagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
+    getAdditionalModulePackagePartProvider: (GlobalSearchScope) -> PackagePartProvider? = { null }
 ): FirSession {
     return createSessionWithDependencies(
         Name.identifier(moduleName),
@@ -48,7 +49,8 @@ fun createSessionForTests(
         sourceScope,
         librariesScope,
         lookupTracker,
-        packagePartProvider
+        getPackagePartProvider,
+        getAdditionalModulePackagePartProvider
     )
 }