From 90a9ca6cb368d3c1e41cbaf1ee82815b67f9111f Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 14 Aug 2019 14:18:08 +0300 Subject: [PATCH] Minor. Rename flag in JvmAnalysisFlags: jsr305 -> javaTypeEnhancementState --- .../kotlin/cli/common/arguments/K2JVMCompilerArguments.kt | 2 +- .../src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt | 2 +- .../src/org/jetbrains/kotlin/frontend/java/di/injection.kt | 2 +- .../jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt | 2 +- .../kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt | 2 +- .../kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt | 2 +- compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt | 2 +- .../src/org/jetbrains/kotlin/idea/project/Platform.kt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt index e2fa164900c..2c9742d16e8 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt @@ -395,7 +395,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() { override fun configureAnalysisFlags(collector: MessageCollector): MutableMap, Any> { val result = super.configureAnalysisFlags(collector) result[JvmAnalysisFlags.strictMetadataVersionSemantics] = strictMetadataVersionSemantics - result[JvmAnalysisFlags.jsr305] = JavaTypeEnhancementStateParser(collector).parse( + result[JvmAnalysisFlags.javaTypeEnhancementState] = JavaTypeEnhancementStateParser(collector).parse( jsr305, supportCompatqualCheckerFrameworkAnnotations ) diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt index ff97c379699..6f2ab9253f7 100644 --- a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt +++ b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt @@ -13,7 +13,7 @@ object JvmAnalysisFlags { val strictMetadataVersionSemantics by AnalysisFlag.Delegates.Boolean @JvmStatic - val jsr305 by Delegates.Jsr305StateWarnByDefault + val javaTypeEnhancementState by AnalysisFlag.Delegates.JavaTypeEnhancementStateWarnByDefault @JvmStatic val jvmDefaultMode by Delegates.JvmDefaultModeDisabledByDefault diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt index 7d42402dfe6..f17a0fdff53 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt @@ -121,7 +121,7 @@ fun StorageComponentContainer.configureJavaSpecificComponents( useImpl() } - useInstance(languageVersionSettings.getFlag(JvmAnalysisFlags.jsr305)) + useInstance(languageVersionSettings.getFlag(JvmAnalysisFlags.javaTypeEnhancementState)) if (useBuiltInsProvider) { useInstance((moduleContext.module.builtIns as JvmBuiltIns).settings) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt index be8a731b845..9ecf4b14116 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt @@ -78,7 +78,7 @@ abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() { name to state }.toMap() - return mapOf(JvmAnalysisFlags.jsr305 to JavaTypeEnhancementState(globalState, migrationState, userAnnotationsState)) + return mapOf(JvmAnalysisFlags.javaTypeEnhancementState to JavaTypeEnhancementState(globalState, migrationState, userAnnotationsState)) } private fun List.getDirectiveValue(directive: String): ReportLevel? = mapNotNull { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt index 7b2125d3c1e..53b8b55cd82 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt @@ -47,7 +47,7 @@ class LoadJavaPackageAnnotationsTest : KtUsefulTestCase() { put(JVMConfigurationKeys.USE_JAVAC, true) } languageVersionSettings = LanguageVersionSettingsImpl( - LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, mapOf(JvmAnalysisFlags.jsr305 to JavaTypeEnhancementState.STRICT) + LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, mapOf(JvmAnalysisFlags.javaTypeEnhancementState to JavaTypeEnhancementState.STRICT) ) configurator(this) } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt index c096d86a156..4f7c10a5eef 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt @@ -97,7 +97,7 @@ class TypeQualifierAnnotationResolverTest : KtUsefulTestCase() { listOf(File(TEST_DATA_PATH)) ).apply { languageVersionSettings = LanguageVersionSettingsImpl( - LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, mapOf(JvmAnalysisFlags.jsr305 to JavaTypeEnhancementState.STRICT) + LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, mapOf(JvmAnalysisFlags.javaTypeEnhancementState to JavaTypeEnhancementState.STRICT) ) } diff --git a/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt b/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt index 90788074b19..aed5a27045c 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt @@ -34,7 +34,7 @@ class AnalysisFlag internal constructor( operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, ExplicitApiMode.DISABLED) } - object Jsr305StateWarnByDefault { + object JavaTypeEnhancementStateWarnByDefault { operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, JavaTypeEnhancementState.DEFAULT) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt index bec47c5008d..1a62ac4b45c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt @@ -150,7 +150,7 @@ fun Project.getLanguageVersionSettings( } val extraAnalysisFlags = additionalArguments.configureAnalysisFlags(MessageCollector.NONE).apply { - if (javaTypeEnhancementState != null) put(JvmAnalysisFlags.jsr305, javaTypeEnhancementState) + if (javaTypeEnhancementState != null) put(JvmAnalysisFlags.javaTypeEnhancementState, javaTypeEnhancementState) initIDESpecificAnalysisSettings(this@getLanguageVersionSettings) }