From d0e912167ebf576631710a6015d58c754267bfc8 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 7 Sep 2017 14:04:47 +0300 Subject: [PATCH] Minor. Simplify handling nullablility for warning --- .../load/java/typeEnhancement/signatureEnhancement.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt index 0775ba5e1b0..d57ca6473f0 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt @@ -317,7 +317,6 @@ class SignatureEnhancement(private val annotationTypeQualifierResolver: Annotati val nullabilityFromSupertypesWithWarning = fromSupertypes .mapNotNull { it.unwrapEnhancement().extractQualifiers().nullability } .toSet() - .takeIf { it != nullabilityFromSupertypes } val own = extractQualifiersFromAnnotations(isHeadTypeConstructor) val isAnyNonNullTypeParameter = own.isNotNullTypeParameter || superQualifiers.any { it.isNotNullTypeParameter } @@ -353,10 +352,10 @@ class SignatureEnhancement(private val annotationTypeQualifierResolver: Annotati val nullability = nullabilityFromSupertypes.select(NullabilityQualifier.NOT_NULL, NullabilityQualifier.NULLABLE, ownNullability) val mutability = mutabilityFromSupertypes.select(MutabilityQualifier.MUTABLE, MutabilityQualifier.READ_ONLY, own.mutability) - val canChange = ownNullabilityForWarning != ownNullability || nullabilityFromSupertypesWithWarning != null + val canChange = ownNullabilityForWarning != ownNullability || nullabilityFromSupertypesWithWarning != nullabilityFromSupertypes if (nullability == null && canChange) { - val nullabilityWithWarning = (nullabilityFromSupertypesWithWarning ?: nullabilityFromSupertypes) - .select(NullabilityQualifier.NOT_NULL, NullabilityQualifier.NULLABLE, ownNullabilityForWarning) + val nullabilityWithWarning = + nullabilityFromSupertypesWithWarning.select(NullabilityQualifier.NOT_NULL, NullabilityQualifier.NULLABLE, ownNullabilityForWarning) return createJavaTypeQualifiers(nullabilityWithWarning, mutability, true) }