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

[NI] Fix nullability for captured type in input types approximation

Browse Source
This commit is contained in:
Dmitry Petrov
2017-06-09 12:32:18 +03:00
committed by Mikhail Zarechenskiy
parent e5c87fdad7
commit d4e8a30dcf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/types/checker/NewCapturedType.kt
+3 -1
View File
@@ -40,7 +40,9 @@ fun prepareArgumentTypeRegardingCaptureTypes(argumentType: UnwrappedType): Unwra
} }
if (simpleType is NewCapturedType) { if (simpleType is NewCapturedType) {
// todo may be we should respect flexible capture types also... // todo may be we should respect flexible capture types also...
return simpleType.constructor.supertypes.takeIf { it.isNotEmpty() }?.let{ intersectTypes(it) } ?: argumentType.builtIns.nullableAnyType return simpleType.constructor.supertypes.takeIf { it.isNotEmpty() }?.let {
intersectTypes(it).makeNullableAsSpecified(simpleType.isMarkedNullable)
} ?: argumentType.builtIns.nullableAnyType
} }
return captureFromExpression(simpleType) return captureFromExpression(simpleType)
} }