azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename flag Xjsr305-annotations->Xjsr305

Browse Source
This commit is contained in:
e5l
2017-09-06 18:04:31 +03:00
parent 30c7f633bd
commit 5bb88b659b
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+5 -5
View File
@@ -161,19 +161,19 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
var javacArguments: Array<String>? 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<String>? by FreezableVar(null)
override fun configureAnalysisFlags(): MutableMap<AnalysisFlag<*>, 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
}
compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt
+1 -1
View File
@@ -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)
compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt
+2 -2
View File
@@ -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)
)
}
}
compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt
+1 -1
View File
@@ -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)
}
compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt
+1 -1
View File
@@ -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)
)
}
compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt
+3 -3
View File
@@ -39,8 +39,8 @@ class AnalysisFlag<out T> 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<out T> internal constructor(
val multiPlatformDoNotCheckImpl by Flag.Boolean
@JvmStatic
val jsr305GlobalState by Flag.Jsr305StateIgnoreByDefault
val jsr305 by Flag.Jsr305StateWarnByDefault
}
}
core/util.runtime/src/org/jetbrains/kotlin/utils/Jsr305State.kt
+1 -1
View File
@@ -23,7 +23,7 @@ enum class Jsr305State(
) {
IGNORE("ignore"),
WARN("warn", shouldReportWarning = true),
ENABLE("enable", shouldReportError = true),
STRICT("enable", shouldReportError = true),
;
companion object {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
+2 -2
View File
@@ -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
}
}
idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt
+1 -1
View File
@@ -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
}
}
}