@@ -8213,8 +8213,8 @@ namespace ts {
8213
8213
for (let i = 0; i < checkCount; i++) {
8214
8214
const sourceType = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source);
8215
8215
const targetType = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target);
8216
- const sourceSig = getSingleCallSignature(sourceType);
8217
- const targetSig = getSingleCallSignature(targetType);
8216
+ const sourceSig = getSingleCallSignature(getNonNullableType( sourceType) );
8217
+ const targetSig = getSingleCallSignature(getNonNullableType( targetType) );
8218
8218
// In order to ensure that any generic type Foo<T> is at least co-variant with respect to T no matter
8219
8219
// how Foo uses T, we need to relate parameters bi-variantly (given that parameters are input positions,
8220
8220
// they naturally relate only contra-variantly). However, if the source and target parameters both have
@@ -8223,7 +8223,9 @@ namespace ts {
8223
8223
// similar to return values, callback parameters are output positions. This means that a Promise<T>,
8224
8224
// where T is used only in callback parameter positions, will be co-variant (as opposed to bi-variant)
8225
8225
// with respect to T.
8226
- const related = sourceSig && targetSig && !sourceSig.typePredicate && !targetSig.typePredicate ?
8226
+ const callbacks = sourceSig && targetSig && !sourceSig.typePredicate && !targetSig.typePredicate &&
8227
+ (getFalsyFlags(sourceType) & TypeFlags.Nullable) === (getFalsyFlags(targetType) & TypeFlags.Nullable);
8228
+ const related = callbacks ?
8227
8229
compareSignaturesRelated(targetSig, sourceSig, /*checkAsCallback*/ true, /*ignoreReturnTypes*/ false, reportErrors, errorReporter, compareTypes) :
8228
8230
!checkAsCallback && compareTypes(sourceType, targetType, /*reportErrors*/ false) || compareTypes(targetType, sourceType, reportErrors);
8229
8231
if (!related) {
0 commit comments