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

Take into account user defined jsr-305 annotations

Browse Source
This commit is contained in:
Victor Petukhov
2021-06-11 10:29:21 +03:00
parent b2dff10e32
commit b0a44705b4
1 changed files with 2 additions and 1 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
+2 -1
View File
@@ -169,7 +169,8 @@ class JavaTypeEnhancementStateParser(
return Jsr305Settings( return Jsr305Settings(
globalLevel = globalLevel, globalLevel = globalLevel,
migrationLevel = migration ?: getDefaultMigrationJsr305ReportLevelForGivenGlobal(globalLevel), migrationLevel = migration ?: getDefaultMigrationJsr305ReportLevelForGivenGlobal(globalLevel),
userDefinedLevelForSpecificAnnotation = defaultSettings.userDefinedLevelForSpecificAnnotation userDefinedLevelForSpecificAnnotation = userDefined.takeIf { it.isNotEmpty() }
?: defaultSettings.userDefinedLevelForSpecificAnnotation
) )
} }