@@ -8177,8 +8177,7 @@ namespace ts {
8177
8177
function isSignatureAssignableTo(source: Signature,
8178
8178
target: Signature,
8179
8179
ignoreReturnTypes: boolean): boolean {
8180
- return compareSignaturesRelated(source, target, /*strictVariance*/ false, ignoreReturnTypes, /*reportErrors*/ false,
8181
- /*errorReporter*/ undefined, compareTypesAssignable) !== Ternary.False;
8180
+ return compareSignaturesRelated(source, target, ignoreReturnTypes, /*reportErrors*/ false, /*errorReporter*/ undefined, compareTypesAssignable) !== Ternary.False;
8182
8181
}
8183
8182
8184
8183
type ErrorReporter = (message: DiagnosticMessage, arg0?: string, arg1?: string) => void;
@@ -8188,7 +8187,6 @@ namespace ts {
8188
8187
*/
8189
8188
function compareSignaturesRelated(source: Signature,
8190
8189
target: Signature,
8191
- strictVariance: boolean,
8192
8190
ignoreReturnTypes: boolean,
8193
8191
reportErrors: boolean,
8194
8192
errorReporter: ErrorReporter,
@@ -8231,17 +8229,9 @@ namespace ts {
8231
8229
const sourceParams = source.parameters;
8232
8230
const targetParams = target.parameters;
8233
8231
for (let i = 0; i < checkCount; i++) {
8234
- const sourceType = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source);
8235
- const targetType = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target);
8236
- const sourceSig = getSingleCallSignature(sourceType);
8237
- const targetSig = getSingleCallSignature(targetType);
8238
- // If the source and target parameters both have function types with a single call signature we are
8239
- // relating two callback parameters. In that case we compare the callback signatures with strict
8240
- // variance, meaning we require the callback parameters to be pairwise co-variant (because, similar
8241
- // to return values, callback parameters are output positions).
8242
- const related = sourceSig && targetSig ?
8243
- compareSignaturesRelated(targetSig, sourceSig, /*strictVariance*/ true, /*ignoreReturnTypes*/ false, reportErrors, errorReporter, compareTypes) :
8244
- !strictVariance && compareTypes(sourceType, targetType, /*reportErrors*/ false) || compareTypes(targetType, sourceType, reportErrors);
8232
+ const s = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source);
8233
+ const t = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target);
8234
+ const related = compareTypes(s, t, /*reportErrors*/ false) || compareTypes(t, s, reportErrors);
8245
8235
if (!related) {
8246
8236
if (reportErrors) {
8247
8237
errorReporter(Diagnostics.Types_of_parameters_0_and_1_are_incompatible,
@@ -9241,7 +9231,7 @@ namespace ts {
9241
9231
* See signatureAssignableTo, compareSignaturesIdentical
9242
9232
*/
9243
9233
function signatureRelatedTo(source: Signature, target: Signature, reportErrors: boolean): Ternary {
9244
- return compareSignaturesRelated(source, target, /*strictVariance*/ false, /* ignoreReturnTypes*/ false, reportErrors, reportError, isRelatedTo);
9234
+ return compareSignaturesRelated(source, target, /*ignoreReturnTypes*/ false, reportErrors, reportError, isRelatedTo);
9245
9235
}
9246
9236
9247
9237
function signaturesIdenticalTo(source: Type, target: Type, kind: SignatureKind): Ternary {
0 commit comments