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 0329c0de1c0..a5be6ac2d63 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 @@ -161,19 +161,19 @@ class K2JVMCompilerArguments : CommonCompilerArguments() { var javacArguments: Array? by FreezableVar(null) @Argument( - value = "-Xjsr305-annotations", - valueDescription = "{ignore|enable|warn}", + value = "-Xjsr305", + valueDescription = "{ignore|strict|warn}", description = "Specify global behavior for JSR-305 nullability annotations: ignore, treat as other supported nullability annotations, or report a warning" ) - var jsr305GlobalState: String? by FreezableVar(Jsr305State.DEFAULT.description) + var jsr305: String? by FreezableVar(Jsr305State.DEFAULT.description) // Paths to output directories for friend modules. var friendPaths: Array? by FreezableVar(null) override fun configureAnalysisFlags(): MutableMap, Any> { val result = super.configureAnalysisFlags() - Jsr305State.findByDescription(jsr305GlobalState)?.let { - result.put(AnalysisFlag.jsr305GlobalState, it) + Jsr305State.findByDescription(jsr305)?.let { + result.put(AnalysisFlag.jsr305, it) } return result } 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 69ed2dcd1b3..2d5a1bde482 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 @@ -101,7 +101,7 @@ fun createContainerForLazyResolveWithJava( useInstance(languageVersionSettings) - useInstance(languageVersionSettings.getFlag(AnalysisFlag.jsr305GlobalState)) + useInstance(languageVersionSettings.getFlag(AnalysisFlag.jsr305)) if (useBuiltInsProvider) { useInstance((moduleContext.module.builtIns as JvmBuiltIns).settings) diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt index 1a4d44d87a4..32df4acffdd 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt @@ -54,9 +54,9 @@ abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() { InTextDirectivesUtils.isDirectiveDefined(it.expectedText, WARNING_FOR_JSR305_ANNOTATIONS_DIRECTIVE) } - val jsr305State = if (hasWarningDirective) Jsr305State.WARN else Jsr305State.ENABLE + val jsr305State = if (hasWarningDirective) Jsr305State.WARN else Jsr305State.STRICT return LanguageVersionSettingsImpl(LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, - mapOf(AnalysisFlag.jsr305GlobalState to jsr305State) + mapOf(AnalysisFlag.jsr305 to jsr305State) ) } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt index a2cfcd0d082..3cbc39b3f48 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(AnalysisFlag.jsr305GlobalState to Jsr305State.ENABLE) + LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, mapOf(AnalysisFlag.jsr305 to Jsr305State.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 88f0730ea5e..90f47166f91 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt @@ -96,7 +96,7 @@ class TypeQualifierAnnotationResolverTest : KtUsefulTestCase() { listOf(File(TEST_DATA_PATH)) ).apply { languageVersionSettings = LanguageVersionSettingsImpl( - LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, mapOf(AnalysisFlag.jsr305GlobalState to Jsr305State.ENABLE) + LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, mapOf(AnalysisFlag.jsr305 to Jsr305State.STRICT) ) } diff --git a/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt b/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt index 1593d20b9b0..35919e44de1 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt @@ -39,8 +39,8 @@ class AnalysisFlag internal constructor( operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Flag(property.name, false) } - object Jsr305StateIgnoreByDefault { - operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Flag(property.name, Jsr305State.IGNORE) + object Jsr305StateWarnByDefault { + operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Flag(property.name, Jsr305State.WARN) } } @@ -52,6 +52,6 @@ class AnalysisFlag internal constructor( val multiPlatformDoNotCheckImpl by Flag.Boolean @JvmStatic - val jsr305GlobalState by Flag.Jsr305StateIgnoreByDefault + val jsr305 by Flag.Jsr305StateWarnByDefault } } \ No newline at end of file diff --git a/core/util.runtime/src/org/jetbrains/kotlin/utils/Jsr305State.kt b/core/util.runtime/src/org/jetbrains/kotlin/utils/Jsr305State.kt index 29052e69ddb..6bc6552c029 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/utils/Jsr305State.kt +++ b/core/util.runtime/src/org/jetbrains/kotlin/utils/Jsr305State.kt @@ -23,7 +23,7 @@ enum class Jsr305State( ) { IGNORE("ignore"), WARN("warn", shouldReportWarning = true), - ENABLE("enable", shouldReportError = true), + STRICT("enable", shouldReportError = true), ; companion object { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt index e372952b3f4..bfae1e7df72 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt @@ -43,9 +43,9 @@ object IDELanguageSettingsProvider : LanguageSettingsProvider { val settings = KotlinFacetSettingsProvider.getInstance(project).getSettings(module) ?: continue val compilerArguments = settings.compilerArguments as? K2JVMCompilerArguments ?: continue - val jsr305state = Jsr305State.findByDescription(compilerArguments.jsr305GlobalState) + val jsr305state = Jsr305State.findByDescription(compilerArguments.jsr305) if (jsr305state != null && jsr305state != Jsr305State.IGNORE) { - map.put(AnalysisFlag.jsr305GlobalState, jsr305state) + map.put(AnalysisFlag.jsr305, jsr305state) break } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt index 3155d63e77d..cfda3a94a2c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt @@ -46,7 +46,7 @@ class Jsr305HighlightingTest : KotlinLightCodeInsightFixtureTestCase() { super.configureModule(module, model) module.createFacet(TargetPlatformKind.Jvm(JvmTarget.JVM_1_8)) val facetSettings = KotlinFacetSettingsProvider.getInstance(project).getInitializedSettings(module) - (facetSettings.compilerArguments as K2JVMCompilerArguments).jsr305GlobalState = Jsr305State.ENABLE.description + (facetSettings.compilerArguments as K2JVMCompilerArguments).jsr305 = Jsr305State.STRICT.description } } }