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

Fix two other tests to treat both old and new JSpecify packages the same

Browse Source
This commit is contained in:
Kevin Bourrillion
2022-12-12 19:10:07 -08:00
committed by Space Team
parent 503e093af3
commit 70cd547c26
2 changed files with 5 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
+1
View File
@@ -58,6 +58,7 @@ class JavaTypeEnhancementStateParser(
return JavaTypeEnhancementState(jsr305Settings) { return JavaTypeEnhancementState(jsr305Settings) {
when { when {
it.isSubpackageOf(JSPECIFY_OLD_ANNOTATIONS_PACKAGE) -> jspecifyReportLevel
it.isSubpackageOf(JSPECIFY_ANNOTATIONS_PACKAGE) -> jspecifyReportLevel it.isSubpackageOf(JSPECIFY_ANNOTATIONS_PACKAGE) -> jspecifyReportLevel
it.isSubpackageOf(CHECKER_FRAMEWORK_COMPATQUAL_ANNOTATIONS_PACKAGE) -> compatqualCheckerFrameworkAnnotationsReportLevel it.isSubpackageOf(CHECKER_FRAMEWORK_COMPATQUAL_ANNOTATIONS_PACKAGE) -> compatqualCheckerFrameworkAnnotationsReportLevel
else -> getReportLevelForAnnotation(it, nullabilityAnnotationReportLevels, kotlinVersion) else -> getReportLevelForAnnotation(it, nullabilityAnnotationReportLevels, kotlinVersion)
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt
+4 -1
View File
@@ -60,7 +60,10 @@ open class JvmForeignAnnotationsConfigurator(testServices: TestServices) : Envir
}.toMap() }.toMap()
val configuredReportLevels = NullabilityAnnotationStatesImpl( val configuredReportLevels = NullabilityAnnotationStatesImpl(
buildMap<FqName, ReportLevel> { buildMap<FqName, ReportLevel> {
directives.singleOrZeroValue(JSPECIFY_STATE)?.let { put(JSPECIFY_ANNOTATIONS_PACKAGE, it) } directives.singleOrZeroValue(JSPECIFY_STATE)?.let {
put(JSPECIFY_OLD_ANNOTATIONS_PACKAGE, it)
put(JSPECIFY_ANNOTATIONS_PACKAGE, it)
}
for ((fqname, reportLevel) in directives[ForeignAnnotationsDirectives.NULLABILITY_ANNOTATIONS]) { for ((fqname, reportLevel) in directives[ForeignAnnotationsDirectives.NULLABILITY_ANNOTATIONS]) {
put(fqname, reportLevel) put(fqname, reportLevel)
} }