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

SLC: account for upperbounds when computing nullability of type parameter

Browse Source
This commit is contained in:
Jinseong Jeon
2022-08-28 16:00:24 -07:00
committed by Ilya Kirillov
parent e83819e682
commit 4859524115
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt
+3 -7
View File
@@ -149,13 +149,9 @@ internal fun KtAnalysisSession.getTypeNullability(ktType: KtType): NullabilityTy
if (ktType.isUnit) return NullabilityType.NotNull
if (ktType is KtTypeParameterType) {
// TODO Make supertype checking
// val subtypeOfNullableSuperType = context.firRef.withFir(phase) {
// it.session.typeCheckerContext.nullableAnyType().isSupertypeOf(it.session.typeCheckerContext, coneType)
// }
// if (!subtypeOfNullableSuperType) return NullabilityType.NotNull
return if (!ktType.isMarkedNullable) NullabilityType.Unknown else NullabilityType.NotNull
if (ktType.isMarkedNullable) return NullabilityType.Nullable
val subtypeOfNullableSuperType = ktType.symbol.upperBounds.all { upperBound -> upperBound.canBeNull }
return if (!subtypeOfNullableSuperType) NullabilityType.NotNull else NullabilityType.Unknown
}
if (ktType !is KtClassType) return NullabilityType.NotNull