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

Fix enhancement behavior in case of error-typed upper bounds

Browse Source
This commit is contained in:
Denis Zharkov
2019-08-19 18:40:33 +03:00
committed by Victor Petukhov
parent 2964d52640
commit c1b34a83e9
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt
+1
View File
@@ -428,6 +428,7 @@ class SignatureEnhancement(
// Do not use bounds from Kotlin-defined type parameters // Do not use bounds from Kotlin-defined type parameters
if (this !is LazyJavaTypeParameterDescriptor) return null if (this !is LazyJavaTypeParameterDescriptor) return null
return when { return when {
upperBounds.all(KotlinType::isError) -> null
upperBounds.all(KotlinType::isNullabilityFlexible) -> null upperBounds.all(KotlinType::isNullabilityFlexible) -> null
upperBounds.any { !it.isNullable() } -> NullabilityQualifier.NOT_NULL upperBounds.any { !it.isNullable() } -> NullabilityQualifier.NOT_NULL
else -> NullabilityQualifier.NULLABLE else -> NullabilityQualifier.NULLABLE