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

[FIR] Save type attributes in ConeKotlinType.withNullability

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-06-29 16:36:51 +03:00
parent 840d3975cc
commit 25fd5cd4ac
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt
+3 -3
View File
@@ -125,8 +125,8 @@ fun <T : ConeKotlinType> T.withNullability(nullability: ConeNullability, typeCon
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
return when (this) { return when (this) {
is ConeClassErrorType -> this is ConeClassErrorType -> this
is ConeClassLikeTypeImpl -> ConeClassLikeTypeImpl(lookupTag, typeArguments, nullability.isNullable) is ConeClassLikeTypeImpl -> ConeClassLikeTypeImpl(lookupTag, typeArguments, nullability.isNullable, attributes)
is ConeTypeParameterTypeImpl -> ConeTypeParameterTypeImpl(lookupTag, nullability.isNullable) is ConeTypeParameterTypeImpl -> ConeTypeParameterTypeImpl(lookupTag, nullability.isNullable, attributes)
is ConeFlexibleType -> { is ConeFlexibleType -> {
if (nullability == ConeNullability.UNKNOWN) { if (nullability == ConeNullability.UNKNOWN) {
if (lowerBound.nullability != upperBound.nullability || lowerBound.nullability == ConeNullability.UNKNOWN) { if (lowerBound.nullability != upperBound.nullability || lowerBound.nullability == ConeNullability.UNKNOWN) {
@@ -136,7 +136,7 @@ fun <T : ConeKotlinType> T.withNullability(nullability: ConeNullability, typeCon
coneFlexibleOrSimpleType(typeContext, lowerBound.withNullability(nullability), upperBound.withNullability(nullability)) coneFlexibleOrSimpleType(typeContext, lowerBound.withNullability(nullability), upperBound.withNullability(nullability))
} }
is ConeTypeVariableType -> ConeTypeVariableType(nullability, lookupTag) is ConeTypeVariableType -> ConeTypeVariableType(nullability, lookupTag)
is ConeCapturedType -> ConeCapturedType(captureStatus, lowerType, nullability, constructor) is ConeCapturedType -> ConeCapturedType(captureStatus, lowerType, nullability, constructor, attributes)
is ConeIntersectionType -> when (nullability) { is ConeIntersectionType -> when (nullability) {
ConeNullability.NULLABLE -> this.mapTypes { ConeNullability.NULLABLE -> this.mapTypes {
it.withNullability(nullability) it.withNullability(nullability)