[analysis api fir] put every library into a separate KtModule in tests

analysis/analysis-api-fir/build.gradle.kts

@@ -39,9 +39,6 @@ dependencies {
     testApiJUnit5()
     testApi(project(":analysis:symbol-light-classes"))
 
-    // We use 'api' instead of 'implementation' because other modules might be using these jars indirectly
-    testApi(project(":plugins:fir-plugin-prototype"))
-    testApi(projectTests(":plugins:fir-plugin-prototype"))
 }
 
 sourceSets {

analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/configurators/AnalysisApiFirTestConfiguratorFactory.kt

@@ -6,8 +6,8 @@
 package org.jetbrains.kotlin.analysis.api.fir.test.configurators
 
 import org.jetbrains.kotlin.analysis.api.fir.test.configurators.library.AnalysisApiFirLibraryBinaryTestConfigurator
-import org.jetbrains.kotlin.analysis.api.fir.test.configurators.source.AnalysisApiFirSourceTestConfigurator
 import org.jetbrains.kotlin.analysis.api.fir.test.configurators.library.AnalysisApiFirLibrarySourceTestConfigurator
+import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator
 import org.jetbrains.kotlin.analysis.test.framework.test.configurators.*
 
 object AnalysisApiFirTestConfiguratorFactory : AnalysisApiTestConfiguratorFactory() {

analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/configurators/library/AnalysisApiFirLibraryBinaryTestConfigurator.kt

@@ -7,23 +7,24 @@ package org.jetbrains.kotlin.analysis.api.fir.test.configurators.library
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiManager
-import org.jetbrains.kotlin.analysis.api.fir.test.configurators.source.AnalysisApiFirSourceTestConfigurator
+import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiBaseTestServiceRegistrar
 import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiLibraryBaseTestServiceRegistrar
 import org.jetbrains.kotlin.analysis.api.impl.base.util.LibraryUtils
+import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtModuleProjectStructure
 import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtModuleWithFiles
-import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
 import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AnalysisApiFirTestServiceRegistrar
-import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtLibraryModule
+import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator
+import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryModuleImpl
+import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestModuleStructureFactory
 import org.jetbrains.kotlin.analysis.test.framework.services.libraries.compiledLibraryProvider
 import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator
 import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.TestModuleStructure
 import org.jetbrains.kotlin.test.services.TestServices
-import java.nio.file.Path
 
 object AnalysisApiFirLibraryBinaryTestConfigurator : AnalysisApiTestConfigurator() {
     override val analyseInDependentSession: Boolean get() = false
@@ -38,17 +39,28 @@ object AnalysisApiFirLibraryBinaryTestConfigurator : AnalysisApiTestConfigurator
         moduleStructure: TestModuleStructure,
         testServices: TestServices,
         project: Project
-    ): List<KtModuleWithFiles> {
-        val testModule = moduleStructure.modules.single()
-        val library = testServices.compiledLibraryProvider.compileToLibrary(testModule).jar
-        val decompiledFiles = LibraryUtils.getAllPsiFilesFromTheJar(library, project)
+    ): KtModuleProjectStructure {
+        return TestModuleStructureFactory.createProjectStructureByTestStructure(
+            moduleStructure,
+            testServices,
+            project
+        ) { testModule: TestModule, _, _ ->
+            val library = testServices.compiledLibraryProvider.compileToLibrary(testModule).jar
+            val decompiledFiles = LibraryUtils.getAllPsiFilesFromTheJar(library, project)
 
-        return listOf(
             KtModuleWithFiles(
-                TestKtLibraryModule(project, testModule, decompiledFiles, listOf(library), testServices),
-                decompiledFiles,
+                KtLibraryModuleImpl(
+                    testModule.name,
+                    testModule.targetPlatform,
+                    GlobalSearchScope.filesScope(project, decompiledFiles.mapTo(mutableSetOf()) { it.virtualFile }),
+                    project,
+                    binaryRoots = listOf(library),
+                    librarySources = null,
+                    isBuitinsContainingStdlib = false,
+                ),
+                decompiledFiles
             )
-        )
+        }
     }
 
 

analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/configurators/library/AnalysisApiFirLibrarySourceTestConfigurator.kt

@@ -8,30 +8,27 @@ package org.jetbrains.kotlin.analysis.api.fir.test.configurators.library
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.kotlin.analysis.api.fir.test.configurators.source.AnalysisApiFirSourceTestConfigurator
 import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiBaseTestServiceRegistrar
 import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiLibraryBaseTestServiceRegistrar
 import org.jetbrains.kotlin.analysis.api.impl.base.util.LibraryUtils
+import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtModuleProjectStructure
 import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtModuleWithFiles
+import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.SealedClassesInheritorsCaclulatorPreAnalysisHandler
 import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AnalysisApiFirTestServiceRegistrar
-import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule
-import org.jetbrains.kotlin.analysis.project.structure.KtLibrarySourceModule
-import org.jetbrains.kotlin.analysis.project.structure.KtModule
-import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtLibrarySourceModule
+import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator
+import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryModuleImpl
+import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibrarySourceModuleImpl
+import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestModuleStructureFactory
 import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompiledLibraryProvider
 import org.jetbrains.kotlin.analysis.test.framework.services.libraries.compiledLibraryProvider
 import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator
 import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar
-import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
-import org.jetbrains.kotlin.test.frontend.fir.getAnalyzerServices
 import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.ServiceRegistrationData
 import org.jetbrains.kotlin.test.services.TestModuleStructure
 import org.jetbrains.kotlin.test.services.TestServices
-import java.nio.file.Path
 
 object AnalysisApiFirLibrarySourceTestConfigurator : AnalysisApiTestConfigurator() {
     override val analyseInDependentSession: Boolean get() = false
@@ -40,34 +37,49 @@ object AnalysisApiFirLibrarySourceTestConfigurator : AnalysisApiTestConfigurator
         builder: TestConfigurationBuilder,
         disposable: Disposable
     ) {
-        builder.useAdditionalServices(ServiceRegistrationData(CompiledLibraryProvider::class, ::CompiledLibraryProvider))
+        builder.apply {
+            useAdditionalServices(ServiceRegistrationData(CompiledLibraryProvider::class, ::CompiledLibraryProvider))
+            usePreAnalysisHandlers(::SealedClassesInheritorsCaclulatorPreAnalysisHandler)
+        }
     }
 
     override fun createModules(
         moduleStructure: TestModuleStructure,
         testServices: TestServices,
         project: Project
-    ): List<KtModuleWithFiles> {
-        val testModule = moduleStructure.modules.single()
-        val (libraryJar, librarySourcesJar) = testServices.compiledLibraryProvider.compileToLibrary(testModule)
-
-        val libraryKtModule = KtTestLibraryModule(project, testModule, libraryJar)
-
-        val librarySourceFiles = LibraryUtils
-            .getAllPsiFilesFromTheJar(librarySourcesJar, project)
-
-        val sourcesKtModule = TestKtLibrarySourceModule(
-            project,
-            testModule,
-            librarySourceFiles,
+    ): KtModuleProjectStructure {
+        return TestModuleStructureFactory.createProjectStructureByTestStructure(
+            moduleStructure,
             testServices,
-            libraryKtModule
-        )
-        libraryKtModule.librarySources = sourcesKtModule
+            project
+        ) { testModule: TestModule, _, _ ->
+            val (libraryJar, librarySourcesJar) = testServices.compiledLibraryProvider.compileToLibrary(testModule)
 
-        return listOf(
-            KtModuleWithFiles(sourcesKtModule, librarySourceFiles),
-        )
+            val libraryKtModule = KtLibraryModuleImpl(
+                testModule.name,
+                testModule.targetPlatform,
+                GlobalSearchScope.filesScope(project, LibraryUtils.getAllVirtualFilesFromJar(libraryJar)),
+                project,
+                binaryRoots = listOf(libraryJar),
+                librarySources = null,
+                isBuitinsContainingStdlib = false,
+            )
+
+            val decompiledPsiFilesFromSourceJar = LibraryUtils.getAllPsiFilesFromTheJar(librarySourcesJar, project)
+            val librarySourceKtModule = KtLibrarySourceModuleImpl(
+                testModule.name,
+                testModule.targetPlatform,
+                GlobalSearchScope.filesScope(project, decompiledPsiFilesFromSourceJar.map { it.virtualFile }),
+                project,
+                binaryLibrary = libraryKtModule,
+            )
+            libraryKtModule.librarySources = librarySourceKtModule
+
+            KtModuleWithFiles(
+                librarySourceKtModule,
+                decompiledPsiFilesFromSourceJar
+            )
+        }
     }
 
     override val serviceRegistrars: List<AnalysisApiTestServiceRegistrar> =
@@ -81,27 +93,4 @@ object AnalysisApiFirLibrarySourceTestConfigurator : AnalysisApiTestConfigurator
     override fun doOutOfBlockModification(file: KtFile) {
         AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false).doOutOfBlockModification(file)
     }
-}
-
-private class KtTestLibraryModule(
-    override val project: Project,
-    private val testModule: TestModule,
-    private val jar: Path
-) : KtLibraryModule {
-    override val directRegularDependencies: List<KtModule> get() = emptyList()
-    override val directRefinementDependencies: List<KtModule> get() = emptyList()
-    override val directFriendDependencies: List<KtModule> get() = emptyList()
-
-    override val contentScope: GlobalSearchScope by lazy {
-        GlobalSearchScope.filesScope(project, LibraryUtils.getAllVirtualFilesFromJar(jar))
-    }
-
-    override fun getBinaryRoots(): Collection<Path> = listOf(jar)
-    override val libraryName: String get() = testModule.name
-
-    override lateinit var librarySources: KtLibrarySourceModule
-
-    override val platform: TargetPlatform get() = testModule.targetPlatform
-    override val analyzerServices: PlatformDependentAnalyzerServices get() = testModule.targetPlatform.getAnalyzerServices()
-}
-
+}

analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/configurators/library/AnalysisApiLibrarySourceTestConfigurator.kt

@@ -1,108 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.analysis.api.fir.test.configurators.library
-
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiManager
-import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.kotlin.analysis.api.fir.test.configurators.source.AnalysisApiFirSourceTestConfigurator
-import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiBaseTestServiceRegistrar
-import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiLibraryBaseTestServiceRegistrar
-import org.jetbrains.kotlin.analysis.api.impl.base.util.LibraryUtils
-import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtModuleWithFiles
-import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AnalysisApiFirTestServiceRegistrar
-import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule
-import org.jetbrains.kotlin.analysis.project.structure.KtLibrarySourceModule
-import org.jetbrains.kotlin.analysis.project.structure.KtModule
-import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtLibrarySourceModule
-import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompiledLibraryProvider
-import org.jetbrains.kotlin.analysis.test.framework.services.libraries.compiledLibraryProvider
-import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator
-import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar
-import org.jetbrains.kotlin.platform.TargetPlatform
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices
-import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
-import org.jetbrains.kotlin.test.frontend.fir.getAnalyzerServices
-import org.jetbrains.kotlin.test.model.TestModule
-import org.jetbrains.kotlin.test.services.ServiceRegistrationData
-import org.jetbrains.kotlin.test.services.TestModuleStructure
-import org.jetbrains.kotlin.test.services.TestServices
-import java.nio.file.Path
-
-object AnalysisApiLibrarySourceTestConfigurator : AnalysisApiTestConfigurator() {
-    override val analyseInDependentSession: Boolean get() = false
-
-    override fun configureTest(
-        builder: TestConfigurationBuilder,
-        disposable: Disposable
-    ) {
-        builder.useAdditionalServices(ServiceRegistrationData(CompiledLibraryProvider::class, ::CompiledLibraryProvider))
-    }
-
-    override fun createModules(
-        moduleStructure: TestModuleStructure,
-        testServices: TestServices,
-        project: Project
-    ): List<KtModuleWithFiles> {
-        val testModule = moduleStructure.modules.single()
-        val (libraryJar, librarySourcesJar) = testServices.compiledLibraryProvider.compileToLibrary(testModule)
-
-        val libraryKtModule = KtTestLibraryModule(project, testModule, libraryJar)
-
-        val librarySourceFiles = LibraryUtils
-            .getAllPsiFilesFromTheJar(librarySourcesJar, project)
-
-        val sourcesKtModule = TestKtLibrarySourceModule(
-            project,
-            testModule,
-            librarySourceFiles,
-            testServices,
-            libraryKtModule
-        )
-        libraryKtModule.librarySources = sourcesKtModule
-
-        return listOf(
-            KtModuleWithFiles(sourcesKtModule, librarySourceFiles),
-        )
-    }
-
-    override val serviceRegistrars: List<AnalysisApiTestServiceRegistrar> =
-        listOf(
-            AnalysisApiBaseTestServiceRegistrar,
-            AnalysisApiFirTestServiceRegistrar,
-            AnalysisApiLibraryBaseTestServiceRegistrar,
-        )
-
-
-    override fun doOutOfBlockModification(file: KtFile) {
-        AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false).doOutOfBlockModification(file)
-    }
-}
-
-private class KtTestLibraryModule(
-    override val project: Project,
-    private val testModule: TestModule,
-    private val jar: Path
-) : KtLibraryModule {
-    override val directRegularDependencies: List<KtModule> get() = emptyList()
-    override val directRefinementDependencies: List<KtModule> get() = emptyList()
-    override val directFriendDependencies: List<KtModule> get() = emptyList()
-
-    override val contentScope: GlobalSearchScope by lazy {
-        GlobalSearchScope.filesScope(project, LibraryUtils.getAllVirtualFilesFromJar(jar))
-    }
-
-    override fun getBinaryRoots(): Collection<Path> = listOf(jar)
-    override val libraryName: String get() = testModule.name
-
-    override lateinit var librarySources: KtLibrarySourceModule
-
-    override val platform: TargetPlatform get() = testModule.targetPlatform
-    override val analyzerServices: PlatformDependentAnalyzerServices get() = testModule.targetPlatform.getAnalyzerServices()
-}
-

analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/configurators/source/AnalysisApiFirSourceTestConfigurator.kt

@@ -1,43 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.analysis.api.fir.test.configurators.source
-
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.analysis.api.fir.utils.configureOptionalTestCompilerPlugin
-import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiBaseTestServiceRegistrar
-import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtModuleWithFiles
-import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AnalysisApiFirTestServiceRegistrar
-import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.FirLowLevelAnalysisApiTestConfigurator
-import org.jetbrains.kotlin.analysis.test.framework.project.structure.toKtSourceModules
-import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator
-import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
-import org.jetbrains.kotlin.test.services.TestModuleStructure
-import org.jetbrains.kotlin.test.services.TestServices
-
-class AnalysisApiFirSourceTestConfigurator(override val analyseInDependentSession: Boolean) : AnalysisApiTestConfigurator() {
-    override fun configureTest(builder: TestConfigurationBuilder, disposable: Disposable) {
-        FirLowLevelAnalysisApiTestConfigurator.configureTest(builder, disposable)
-        builder.apply {
-            configureOptionalTestCompilerPlugin()
-        }
-    }
-
-    override val serviceRegistrars: List<AnalysisApiTestServiceRegistrar> = listOf(
-        AnalysisApiBaseTestServiceRegistrar,
-        AnalysisApiFirTestServiceRegistrar,
-    )
-
-    override fun createModules(moduleStructure: TestModuleStructure, testServices: TestServices, project: Project): List<KtModuleWithFiles> {
-        return moduleStructure.toKtSourceModules(testServices, project)
-    }
-
-    override fun doOutOfBlockModification(file: KtFile) {
-        FirLowLevelAnalysisApiTestConfigurator.doOutOfBlockModification(file)
-    }
-}