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

Retain nullability information for type alias arguments which are in turn type aliases #KT-13835 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-09-15 18:13:30 +03:00
parent 090d157f86
commit c1296e2134
6 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeAliasExpander.kt
+5 -1
View File
@@ -153,7 +153,11 @@ class TypeAliasExpander(
}
else -> {
val substitutedArguments = type.arguments.mapIndexed { i, originalArgument ->
expandTypeProjection(originalArgument, typeAliasExpansion, typeConstructor.parameters[i], recursionDepth + 1)
val projection = expandTypeProjection(
originalArgument, typeAliasExpansion, typeConstructor.parameters[i], recursionDepth + 1)
if (projection.isStarProjection) projection
else TypeProjectionImpl(projection.projectionKind,
TypeUtils.makeNullableIfNeeded(projection.type, originalArgument.type.isMarkedNullable))
}
val substitutedType = type.replace(newArguments = substitutedArguments)