From bef5f89f612405d31d191f417404a66ea6dc0046 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 23 Aug 2023 20:56:48 +0200 Subject: [PATCH] [AA] add configurator for scripts ^KT-61431 --- .../AnalysisApiFe10TestConfiguratorFactory.kt | 4 +++- .../AnalysisApiFirTestConfiguratorFactory.kt | 8 +++++++- ...AnalysisApiFirStandaloneModeTestConfiguratorFactory.kt | 8 +++++--- .../AnalysisApiTestConfiguratorServiceFactory.kt | 3 ++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfiguratorFactory.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfiguratorFactory.kt index 58b48417eea..c28ba15dd40 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfiguratorFactory.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfiguratorFactory.kt @@ -30,8 +30,10 @@ object AnalysisApiFe10TestConfiguratorFactory : AnalysisApiTestConfiguratorFacto data.analysisApiMode != AnalysisApiMode.Ide -> false else -> when (data.moduleKind) { TestModuleKind.Source -> true + TestModuleKind.ScriptSource, TestModuleKind.LibraryBinary, - TestModuleKind.LibrarySource -> false + TestModuleKind.LibrarySource, + -> false } } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/configurators/AnalysisApiFirTestConfiguratorFactory.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/configurators/AnalysisApiFirTestConfiguratorFactory.kt index 33dda5f30b6..ad24a519fbb 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/configurators/AnalysisApiFirTestConfiguratorFactory.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/configurators/AnalysisApiFirTestConfiguratorFactory.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.analysis.api.fir.test.configurators import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirLibraryBinaryTestConfigurator import org.jetbrains.kotlin.analysis.api.fir.test.configurators.library.AnalysisApiFirLibrarySourceTestConfigurator +import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirScriptTestConfigurator import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator import org.jetbrains.kotlin.analysis.test.framework.test.configurators.* @@ -15,6 +16,11 @@ object AnalysisApiFirTestConfiguratorFactory : AnalysisApiTestConfiguratorFactor require(supportMode(data)) return when (data.moduleKind) { + TestModuleKind.ScriptSource -> when (data.analysisSessionMode) { + AnalysisSessionMode.Normal -> AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = false) + AnalysisSessionMode.Dependent -> AnalysisApiFirScriptTestConfigurator(analyseInDependentSession = true) + } + TestModuleKind.Source -> when (data.analysisSessionMode) { AnalysisSessionMode.Normal -> AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false) AnalysisSessionMode.Dependent -> AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = true) @@ -37,7 +43,7 @@ object AnalysisApiFirTestConfiguratorFactory : AnalysisApiTestConfiguratorFactor data.frontend != FrontendKind.Fir -> false data.analysisApiMode != AnalysisApiMode.Ide -> false else -> when (data.moduleKind) { - TestModuleKind.Source -> true + TestModuleKind.Source, TestModuleKind.ScriptSource -> true TestModuleKind.LibraryBinary, TestModuleKind.LibrarySource -> data.analysisSessionMode == AnalysisSessionMode.Normal diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/AnalysisApiFirStandaloneModeTestConfiguratorFactory.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/AnalysisApiFirStandaloneModeTestConfiguratorFactory.kt index ab0d3397153..18a6ab5de89 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/AnalysisApiFirStandaloneModeTestConfiguratorFactory.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/AnalysisApiFirStandaloneModeTestConfiguratorFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 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. */ @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.api.standalone.fir.test import org.jetbrains.kotlin.analysis.test.framework.test.configurators.* -public object AnalysisApiFirStandaloneModeTestConfiguratorFactory : AnalysisApiTestConfiguratorFactory() { +object AnalysisApiFirStandaloneModeTestConfiguratorFactory : AnalysisApiTestConfiguratorFactory() { override fun createConfigurator(data: AnalysisApiTestConfiguratorFactoryData): AnalysisApiTestConfigurator { requireSupported(data) @@ -30,8 +30,10 @@ public object AnalysisApiFirStandaloneModeTestConfiguratorFactory : AnalysisApiT data.analysisApiMode != AnalysisApiMode.Standalone -> false else -> when (data.moduleKind) { TestModuleKind.Source -> true + TestModuleKind.ScriptSource, TestModuleKind.LibraryBinary, - TestModuleKind.LibrarySource -> false + TestModuleKind.LibrarySource, + -> false } } } diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestConfiguratorServiceFactory.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestConfiguratorServiceFactory.kt index b86e6475140..717e2f09326 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestConfiguratorServiceFactory.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestConfiguratorServiceFactory.kt @@ -47,5 +47,6 @@ enum class FrontendKind(val suffix: String) { enum class TestModuleKind(val suffix: String) { Source("Source"), LibraryBinary("LibraryBinary"), - LibrarySource("LibrarySource"); + LibrarySource("LibrarySource"), + ScriptSource("ScriptSource"), }