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

Allow multiple same jsr305 options in the command-line

Browse Source 
do not report duplicate jsr305 entries if options are the same
This commit is contained in:
Ilya Chernikov
2018-07-05 13:37:45 +02:00
parent 563e4c9e57
commit ec58929e39
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/Jsr305Parser.kt
+10 -7
View File
@@ -37,19 +37,21 @@ class Jsr305Parser(private val collector: MessageCollector) {
item.startsWith("@") -> {
val (name, state) = parseJsr305UserDefined(item) ?: return@forEach
val current = userDefined[name]
if (current != null) {
if (current == null) {
userDefined[name] = state
} else if (current != state) {
reportDuplicateJsr305("@$name:${current.description}", item)
return@forEach
}
userDefined[name] = state
}
item.startsWith("under-migration") -> {
if (migration != null) {
val state = parseJsr305UnderMigration(item)
if (migration == null) {
migration = state
} else if (migration != state) {
reportDuplicateJsr305("under-migration:${migration?.description}", item)
return@forEach
}
migration = parseJsr305UnderMigration(item)
}
item == "enable" -> {
collector.report(
@@ -61,11 +63,12 @@ class Jsr305Parser(private val collector: MessageCollector) {
global = ReportLevel.STRICT
}
else -> {
if (global != null) {
if (global == null) {
global = ReportLevel.findByDescription(item)
} else if (global!!.description != item) {
reportDuplicateJsr305(global!!.description, item)
return@forEach
}
global = ReportLevel.findByDescription(item)
}
}
}