Fixed new/old type inference diff, sometimes causes problems in JPS

2019-10-30 18:05:34 +03:00
parent 607249e899
commit aa604d0854
1 changed files with 4 additions and 1 deletions
@@ -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<ConeKotlinType>() ?: return@mapNotNull null)
+                )
            }
        }