From a4fd317f9e9a32af8932e3d9c9b9e4aada0d88a5 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 21 Dec 2021 13:24:36 +0100 Subject: [PATCH] [MPP][Test] Rename MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED ... to ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE ^KT-50120 --- .../test/directives/MultiplatformDiagnosticsDirectives.kt | 2 +- .../kotlin/test/frontend/classic/ClassicFrontendFacade.kt | 6 +++--- .../frontend/classic/MultiplatformAnalysisConfiguration.kt | 4 ++-- ...ractDiagnosticsWithMultiplatformCompositeAnalysisTest.kt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/MultiplatformDiagnosticsDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/MultiplatformDiagnosticsDirectives.kt index cb4e12ecf25..d310fc57030 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/MultiplatformDiagnosticsDirectives.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/MultiplatformDiagnosticsDirectives.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.test.directives.model.DirectiveApplicability import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer object MultiplatformDiagnosticsDirectives : SimpleDirectivesContainer() { - val MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED by directive( + val ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE by directive( description = """ If present, sets up the classical frontend in a way, similar to how analysis works in IDE, when dependsOn sources are located in separate module descriptors. If absent, setups the frontend in a "CLI-mode", when there's only two modules: diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt index b6f71d4e897..072339afd25 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt @@ -61,7 +61,7 @@ import org.jetbrains.kotlin.serialization.deserialization.MetadataPartProvider import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives -import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives.MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED +import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives.ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE import org.jetbrains.kotlin.test.model.DependencyRelation import org.jetbrains.kotlin.test.model.FrontendFacade import org.jetbrains.kotlin.test.model.FrontendKinds @@ -351,8 +351,8 @@ class ClassicFrontendFacade( files: List, ): AnalysisResult { // See 'TODO' for adding dependency manager - require(module.dependsOnDependencies.isEmpty() || MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED !in module.directives) { - "Analyzing common modules with 'dependsOn' edges in ${MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED.name} is not supported yet.\n" + + require(module.dependsOnDependencies.isEmpty() || ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE !in module.directives) { + "Analyzing common modules with 'dependsOn' edges in ${ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE.name} is not supported yet.\n" + "Module: ${module.name}\n" + "dependsOn: ${module.dependsOnDependencies.map { it.moduleName }}" } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/MultiplatformAnalysisConfiguration.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/MultiplatformAnalysisConfiguration.kt index 34866c79404..66813df5f2d 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/MultiplatformAnalysisConfiguration.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/MultiplatformAnalysisConfiguration.kt @@ -18,12 +18,12 @@ import org.jetbrains.kotlin.resolve.ModulePath import org.jetbrains.kotlin.resolve.ModuleStructureOracle import org.jetbrains.kotlin.resolve.TargetEnvironment import org.jetbrains.kotlin.resolve.multiplatform.isCommonSource -import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives.MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED +import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives.ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE import org.jetbrains.kotlin.test.model.* import org.jetbrains.kotlin.test.services.* internal fun MultiplatformAnalysisConfiguration(testServices: TestServices): MultiplatformAnalysisConfiguration { - return if (testServices.moduleStructure.allDirectives.contains(MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED)) { + return if (testServices.moduleStructure.allDirectives.contains(ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE)) { MultiplatformCompositeAnalysisConfiguration( testServices.dependencyProvider, testServices.sourceFileProvider, diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest.kt index 015db250237..698e521fbff 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest.kt @@ -9,14 +9,14 @@ import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.SKIP_TXT import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_IDENTICAL import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.LANGUAGE -import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives.MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED +import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives.ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE abstract class AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest : AbstractDiagnosticTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.defaultDirectives { LANGUAGE with "+MultiPlatformProjects" - +MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED + +ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE +SKIP_TXT +FIR_IDENTICAL }