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

Get rid of redundant Jsr305State

Browse Source
This commit is contained in:
Victor Petukhov
2021-06-02 17:37:26 +03:00
parent f46dc713d7
commit ea901d81fb
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/util.runtime/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
+4 -1
View File
@@ -55,10 +55,13 @@ fun getDefaultJsr305Settings(): Jsr305Settings {
} else {
jsr305Settings.reportLevelBefore
}
val migrationLevel = if (globalReportLevel == ReportLevel.WARN) null else globalReportLevel
val migrationLevel = getDefaultMigrationJsr305ReportLevelForGivenGlobal(globalReportLevel)
return Jsr305Settings(globalReportLevel, migrationLevel)
}
fun getDefaultMigrationJsr305ReportLevelForGivenGlobal(globalReportLevel: ReportLevel) =
if (globalReportLevel == ReportLevel.WARN) null else globalReportLevel
fun getDefaultReportLevelForAnnotation(annotationFqName: FqName) = getReportLevelForAnnotation(annotationFqName, emptyMap())
fun getReportLevelForAnnotation(annotation: FqName, configuredReportLevels: Map<FqName, ReportLevel>): ReportLevel {