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

Minor. Simplify handling nullablility for warning

Browse Source
This commit is contained in:
Denis Zharkov
2017-09-07 14:04:47 +03:00
parent 02d3d9785c
commit d0e912167e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt
+3 -4
View File
@@ -317,7 +317,6 @@ class SignatureEnhancement(private val annotationTypeQualifierResolver: Annotati
val nullabilityFromSupertypesWithWarning = fromSupertypes val nullabilityFromSupertypesWithWarning = fromSupertypes
.mapNotNull { it.unwrapEnhancement().extractQualifiers().nullability } .mapNotNull { it.unwrapEnhancement().extractQualifiers().nullability }
.toSet() .toSet()
.takeIf { it != nullabilityFromSupertypes }
val own = extractQualifiersFromAnnotations(isHeadTypeConstructor) val own = extractQualifiersFromAnnotations(isHeadTypeConstructor)
val isAnyNonNullTypeParameter = own.isNotNullTypeParameter || superQualifiers.any { it.isNotNullTypeParameter } 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 nullability = nullabilityFromSupertypes.select(NullabilityQualifier.NOT_NULL, NullabilityQualifier.NULLABLE, ownNullability)
val mutability = mutabilityFromSupertypes.select(MutabilityQualifier.MUTABLE, MutabilityQualifier.READ_ONLY, own.mutability) 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) { if (nullability == null && canChange) {
val nullabilityWithWarning = (nullabilityFromSupertypesWithWarning ?: nullabilityFromSupertypes) val nullabilityWithWarning =
.select(NullabilityQualifier.NOT_NULL, NullabilityQualifier.NULLABLE, ownNullabilityForWarning) nullabilityFromSupertypesWithWarning.select(NullabilityQualifier.NOT_NULL, NullabilityQualifier.NULLABLE, ownNullabilityForWarning)
return createJavaTypeQualifiers(nullabilityWithWarning, mutability, true) return createJavaTypeQualifiers(nullabilityWithWarning, mutability, true)
} }