From 39ffcd3ba6484b7b09ac79341241948e8177bea1 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Wed, 2 Jun 2021 13:26:00 +0300 Subject: [PATCH] User proper report level for compatqual nullability annotations --- .../jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt index 50f120ef327..79b62228850 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt @@ -52,8 +52,8 @@ private fun FirAnnotationCall.extractNullabilityFromKnownAnnotations(javaTypeEnh JSPECIFY_NULLNESS_UNKNOWN_ANNOTATION_ID -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.FORCE_FLEXIBILITY, reportLevel.isWarning) JAVAX_NONNULL_ANNOTATION_ID -> extractNullabilityTypeFromArgument() - COMPATQUAL_NULLABLE_ANNOTATION_ID -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NULLABLE) - COMPATQUAL_NONNULL_ANNOTATION_ID -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL) + COMPATQUAL_NULLABLE_ANNOTATION_ID -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NULLABLE, reportLevel.isWarning) + COMPATQUAL_NONNULL_ANNOTATION_ID -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL, reportLevel.isWarning) ANDROIDX_RECENTLY_NON_NULL_ANNOTATION_ID -> NullabilityQualifierWithMigrationStatus( NullabilityQualifier.NOT_NULL, isForWarningOnly = reportLevel.isWarning