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

Fix extraction of type for start projected type

Browse Source 
Some existing tests start failing after previous commits
This commit is contained in:
Denis.Zharkov
2021-11-15 16:21:14 +03:00
committed by teamcityserver
parent 07440ee4a1
commit dba04bcf80
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/TypeCheckerStateForConstraintSystem.kt
+15 -1
View File
@@ -86,9 +86,23 @@ abstract class TypeCheckerStateForConstraintSystem(
} }
private fun extractTypeForProjectedType(type: KotlinTypeMarker, out: Boolean): KotlinTypeMarker? = with(extensionTypeContext) { private fun extractTypeForProjectedType(type: KotlinTypeMarker, out: Boolean): KotlinTypeMarker? = with(extensionTypeContext) {
val typeMarker = type.asSimpleType()?.asCapturedType() ?: return null val simpleType = type.asSimpleType()
val typeMarker = simpleType?.asCapturedType() ?: return null
val projection = typeMarker.typeConstructorProjection() val projection = typeMarker.typeConstructorProjection()
if (projection.isStarProjection()) {
return when (out) {
true -> simpleType.typeConstructor().supertypes().let {
if (it.isEmpty())
nullableAnyType()
else
intersectTypes(it.toList())
}
false -> typeMarker.lowerType()
}
}
return when (projection.getVariance()) { return when (projection.getVariance()) {
TypeVariance.IN -> if (!out) typeMarker.lowerType() ?: projection.getType() else null TypeVariance.IN -> if (!out) typeMarker.lowerType() ?: projection.getType() else null
TypeVariance.OUT -> if (out) projection.getType() else null TypeVariance.OUT -> if (out) projection.getType() else null