Skip to content

Commit 962cde9

Browse files
committed
Make chainedMessage, terminalMessage, and containingMessageChain optional
1 parent 7dc8683 commit 962cde9

1 file changed

Lines changed: 14 additions & 18 deletions

File tree

src/compiler/checker.ts

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3164,43 +3164,40 @@ module ts {
31643164
var identityRelation: Map<boolean> = {};
31653165

31663166
function isTypeIdenticalTo(source: Type, target: Type): boolean {
3167-
return checkTypeRelatedTo(source, target, identityRelation,
3168-
/*errorNode*/ undefined, /*chainedMessage*/ undefined, /*terminalMessage*/ undefined, /*containingMessageChain*/ undefined);
3167+
return checkTypeRelatedTo(source, target, identityRelation, /*errorNode*/ undefined);
31693168
}
31703169

31713170
function isTypeSubtypeOf(source: Type, target: Type): boolean {
3172-
return checkTypeSubtypeOf(source, target, /*errorNode*/ undefined, /*chainedMessage*/ undefined, /*terminalMessage*/ undefined, /*containingMessageChain*/ undefined);
3171+
return checkTypeSubtypeOf(source, target, /*errorNode*/ undefined);
31733172
}
31743173

31753174
function checkTypeSubtypeOf(
31763175
source: Type,
31773176
target: Type,
31783177
errorNode: Node,
3179-
chainedMessage: DiagnosticMessage,
3180-
terminalMessage: DiagnosticMessage,
3181-
containingMessageChain: DiagnosticMessageChain): boolean {
3178+
chainedMessage?: DiagnosticMessage,
3179+
terminalMessage?: DiagnosticMessage,
3180+
containingMessageChain?: DiagnosticMessageChain): boolean {
31823181

31833182
return checkTypeRelatedTo(source, target, subtypeRelation, errorNode, chainedMessage, terminalMessage, containingMessageChain);
31843183
}
31853184

31863185
function isTypeAssignableTo(source: Type, target: Type): boolean {
3187-
return checkTypeAssignableTo(source, target, /*errorNode*/ undefined, /*chainedMessage*/ undefined, /*terminalMessage*/ undefined);
3186+
return checkTypeAssignableTo(source, target, /*errorNode*/ undefined);
31883187
}
31893188

3190-
function checkTypeAssignableTo(source: Type, target: Type, errorNode: Node, chainedMessage: DiagnosticMessage, terminalMessage: DiagnosticMessage): boolean {
3191-
return checkTypeRelatedTo(source, target, assignableRelation, errorNode, chainedMessage, terminalMessage, /*containingMessageChain*/ undefined);
3189+
function checkTypeAssignableTo(source: Type, target: Type, errorNode: Node, chainedMessage?: DiagnosticMessage, terminalMessage?: DiagnosticMessage): boolean {
3190+
return checkTypeRelatedTo(source, target, assignableRelation, errorNode, chainedMessage, terminalMessage);
31923191
}
31933192

31943193
function isTypeRelatedTo(source: Type, target: Type, relation: Map<boolean>): boolean {
3195-
return checkTypeRelatedTo(source, target, relation,
3196-
/*errorNode*/ undefined, /*chainedMessage*/ undefined, /*terminalMessage*/ undefined, /*containingMessageChain*/ undefined);
3194+
return checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined);
31973195
}
31983196

31993197
function isSignatureAssignableTo(source: Signature, target: Signature): boolean {
32003198
var sourceType = getOrCreateTypeFromSignature(source);
32013199
var targetType = getOrCreateTypeFromSignature(target);
3202-
return checkTypeRelatedTo(sourceType, targetType, assignableRelation,
3203-
/*errorNode*/ undefined, /*chainedMessage*/ undefined, /*terminalMessage*/ undefined, /*containingMessageChain*/ undefined);
3200+
return checkTypeRelatedTo(sourceType, targetType, assignableRelation, /*errorNode*/ undefined);
32043201
}
32053202

32063203
function isPropertyIdenticalTo(sourceProp: Symbol, targetProp: Symbol): boolean {
@@ -3269,9 +3266,9 @@ module ts {
32693266
target: Type,
32703267
relation: Map<boolean>,
32713268
errorNode: Node,
3272-
chainedMessage: DiagnosticMessage,
3273-
terminalMessage: DiagnosticMessage,
3274-
containingMessageChain: DiagnosticMessageChain): boolean {
3269+
chainedMessage?: DiagnosticMessage,
3270+
terminalMessage?: DiagnosticMessage,
3271+
containingMessageChain?: DiagnosticMessageChain): boolean {
32753272

32763273
var errorInfo: DiagnosticMessageChain;
32773274
var sourceStack: ObjectType[];
@@ -5228,8 +5225,7 @@ module ts {
52285225
// Use argument expression as error location when reporting errors
52295226
var isValidArgument = checkTypeRelatedTo(argType, paramType, relation, reportErrors ? arg : undefined,
52305227
Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1,
5231-
Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1,
5232-
/*containingMessageChain*/ undefined);
5228+
Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1);
52335229
if (!isValidArgument) {
52345230
return false;
52355231
}

0 commit comments

Comments
 (0)