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

[Commonizer] Substitute type arguments when argument type is ClassOrTypeAlias type

Browse Source 
^KT-51686 Verification Pending
This commit is contained in:
sebastian.sellmair
2022-03-24 17:18:51 +01:00
committed by Space
parent 4e16e506bb
commit a08fdcf371
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/utils.kt
+12 -6
View File
@@ -91,15 +91,21 @@ internal fun CirClassOrTypeAliasType.withParentArguments(
val newArguments = arguments.map { oldArgument -> val newArguments = arguments.map { oldArgument ->
if (oldArgument !is CirRegularTypeProjection) return@map oldArgument if (oldArgument !is CirRegularTypeProjection) return@map oldArgument
if (oldArgument.type !is CirTypeParameterType) return@map oldArgument
parentArguments[oldArgument.type.index] when (val type = oldArgument.type) {
is CirTypeParameterType -> parentArguments[type.index]
is CirClassOrTypeAliasType -> CirRegularTypeProjection(
oldArgument.projectionKind, type.withParentArguments(parentArguments, parentIsMarkedNullable)
)
else -> oldArgument
}
} }
return when (val newUnderlyingType = makeNullableIfNecessary(newIsMarkedNullable).withArguments(newArguments)) { return when (val newType = makeNullableIfNecessary(newIsMarkedNullable).withArguments(newArguments)) {
this -> this this -> this
is CirClassType -> newUnderlyingType is CirClassType -> newType
is CirTypeAliasType -> newUnderlyingType.withUnderlyingType( is CirTypeAliasType -> newType.withUnderlyingType(
newUnderlyingType.underlyingType.withParentArguments(parentArguments, newIsMarkedNullable) newType.underlyingType.withParentArguments(parentArguments, newIsMarkedNullable)
) )
} }
} }