diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeConfigurator.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeConfigurator.kt index 6547a2c3bf0..f63691fcd78 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeConfigurator.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/StandaloneModeConfigurator.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.analysis.api.standalone.fir.test import com.intellij.openapi.Disposable import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtModuleProjectStructure +import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.SealedClassesInheritorsCaclulatorPreAnalysisHandler import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar @@ -22,7 +23,9 @@ object StandaloneModeConfigurator : AnalysisApiTestConfigurator() { override val frontendKind: FrontendKind get() = FrontendKind.Fir override fun configureTest(builder: TestConfigurationBuilder, disposable: Disposable) { - AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false).configureTest(builder, disposable) + with(builder) { + usePreAnalysisHandlers(::SealedClassesInheritorsCaclulatorPreAnalysisHandler) + } } override val serviceRegistrars: List diff --git a/prepare/analysis-api-test-framework/build.gradle.kts b/prepare/analysis-api-test-framework/build.gradle.kts new file mode 100644 index 00000000000..88ed515d291 --- /dev/null +++ b/prepare/analysis-api-test-framework/build.gradle.kts @@ -0,0 +1,27 @@ +plugins { + java +} + +val testModules = listOf( + ":analysis:analysis-api-fir", + ":analysis:low-level-api-fir", + ":analysis:analysis-test-framework", + ":analysis:analysis-api-impl-barebone", + ":analysis:analysis-api-impl-base", + ":analysis:analysis-api-standalone", +// ":plugins:fir-plugin-prototype", +) + +dependencies { + testModules.forEach { + embedded(projectTests(it)) { isTransitive = false } + } +} + +publish() +runtimeJar() +sourcesJar { + from { + testModules.map { project(it).testSourceSet.allSource } + } +} diff --git a/settings.gradle b/settings.gradle index 2d9d24e017d..2e83532c4e5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -606,7 +606,8 @@ include ":generators:analysis-api-generator", ":analysis:decompiled:decompiler-to-stubs", ":analysis:decompiled:decompiler-to-file-stubs", ":analysis:decompiled:light-classes-for-decompiled", - ":analysis:decompiled:light-classes-for-decompiled-fe10" + ":analysis:decompiled:light-classes-for-decompiled-fe10", + ":prepare:analysis-api-test-framework" if (buildProperties.inJpsBuildIdeaSync) {