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

Minor. Extract JavaTypeEnhancementStateParser::parseJsr305State

Browse Source
This commit is contained in:
Denis Zharkov
2019-08-14 14:14:53 +03:00
committed by Victor Petukhov
parent e7208f0c05
commit 93d9301847
1 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt
+38 -25
View File
@@ -22,7 +22,40 @@ import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
import org.jetbrains.kotlin.utils.ReportLevel import org.jetbrains.kotlin.utils.ReportLevel
class JavaTypeEnhancementStateParser(private val collector: MessageCollector) { class JavaTypeEnhancementStateParser(private val collector: MessageCollector) {
fun parse(value: Array<String>?, supportCompatqualCheckerFrameworkAnnotations: String?): JavaTypeEnhancementState { fun parse(
jsr305Args: Array<String>?, supportCompatqualCheckerFrameworkAnnotations: String?
): JavaTypeEnhancementState {
val jsr305State = parseJsr305State(jsr305Args)
val enableCompatqualCheckerFrameworkAnnotations = when (supportCompatqualCheckerFrameworkAnnotations) {
"enable" -> true
"disable" -> false
null -> null
else -> {
collector.report(
CompilerMessageSeverity.ERROR,
"Unrecognized -Xsupport-compatqual-checker-framework-annotations option: $supportCompatqualCheckerFrameworkAnnotations. Possible values are 'enable'/'disable'"
)
null
}
}
val state = JavaTypeEnhancementState(
jsr305State.global ?: ReportLevel.WARN, jsr305State.migration, jsr305State.usedDefined,
enableCompatqualCheckerFrameworkAnnotations =
enableCompatqualCheckerFrameworkAnnotations
?: JavaTypeEnhancementState.COMPATQUAL_CHECKER_FRAMEWORK_ANNOTATIONS_SUPPORT_DEFAULT_VALUE
)
return if (state == JavaTypeEnhancementState.DISABLED_JSR_305) JavaTypeEnhancementState.DISABLED_JSR_305 else state
}
private data class Jsr305State(
val global: ReportLevel?,
val migration: ReportLevel?,
val usedDefined: Map<String, ReportLevel>
)
private fun parseJsr305State(args: Array<String>?): Jsr305State {
var global: ReportLevel? = null var global: ReportLevel? = null
var migration: ReportLevel? = null var migration: ReportLevel? = null
val userDefined = mutableMapOf<String, ReportLevel>() val userDefined = mutableMapOf<String, ReportLevel>()
@@ -32,7 +65,7 @@ class JavaTypeEnhancementStateParser(private val collector: MessageCollector) {
return ReportLevel.findByDescription(rawState) ?: reportUnrecognizedJsr305(item).let { null } return ReportLevel.findByDescription(rawState) ?: reportUnrecognizedJsr305(item).let { null }
} }
value?.forEach { item -> args?.forEach { item ->
when { when {
item.startsWith("@") -> { item.startsWith("@") -> {
val (name, state) = parseJsr305UserDefined(item) ?: return@forEach val (name, state) = parseJsr305UserDefined(item) ?: return@forEach
@@ -55,8 +88,8 @@ class JavaTypeEnhancementStateParser(private val collector: MessageCollector) {
} }
item == "enable" -> { item == "enable" -> {
collector.report( collector.report(
CompilerMessageSeverity.STRONG_WARNING, CompilerMessageSeverity.STRONG_WARNING,
"Option 'enable' for -Xjsr305 flag is deprecated. Please use 'strict' instead" "Option 'enable' for -Xjsr305 flag is deprecated. Please use 'strict' instead"
) )
if (global != null) return@forEach if (global != null) return@forEach
@@ -72,27 +105,7 @@ class JavaTypeEnhancementStateParser(private val collector: MessageCollector) {
} }
} }
} }
return Jsr305State(global, migration, userDefined)
val enableCompatqualCheckerFrameworkAnnotations = when (supportCompatqualCheckerFrameworkAnnotations) {
"enable" -> true
"disable" -> false
null -> null
else -> {
collector.report(
CompilerMessageSeverity.ERROR,
"Unrecognized -Xsupport-compatqual-checker-framework-annotations option: $supportCompatqualCheckerFrameworkAnnotations. Possible values are 'enable'/'disable'"
)
null
}
}
val state = JavaTypeEnhancementState(
global ?: ReportLevel.WARN, migration, userDefined,
enableCompatqualCheckerFrameworkAnnotations =
enableCompatqualCheckerFrameworkAnnotations
?: JavaTypeEnhancementState.COMPATQUAL_CHECKER_FRAMEWORK_ANNOTATIONS_SUPPORT_DEFAULT_VALUE
)
return if (state == JavaTypeEnhancementState.DISABLED_JSR_305) JavaTypeEnhancementState.DISABLED_JSR_305 else state
} }
private fun reportUnrecognizedJsr305(item: String) { private fun reportUnrecognizedJsr305(item: String) {