From aa604d0854f45156a11106e399c15eb8925e683f Mon Sep 17 00:00:00 2001 From: Alexander Podkhalyuzin Date: Wed, 30 Oct 2019 18:05:34 +0300 Subject: [PATCH] Fixed new/old type inference diff, sometimes causes problems in JPS --- .../src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt index c0e86f66e66..72265037049 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt @@ -134,7 +134,10 @@ class FirSamResolverImpl( for ((newTypeParameter, oldTypeParameter) in newTypeParameters.zip(firRegularClass.typeParameters)) { newTypeParameter.bounds += oldTypeParameter.bounds.mapNotNull { typeRef -> - FirResolvedTypeRefImpl(typeRef.source, substitutor.substituteOrSelf(typeRef.coneTypeSafe() ?: return@mapNotNull null)) + FirResolvedTypeRefImpl( + typeRef.source, + substitutor.substituteOrSelf(typeRef.coneTypeSafe() ?: return@mapNotNull null) + ) } }