microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-14 19:16:17 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Working, just not the way I would like

Browse Source 
There are still separate errors instead of one + related spans for each
sub-error.
This commit is contained in:
Nathan Shively-Sanders 2019-06-18 10:12:32 -07:00
parent c65d9f261a
commit beddf9c02d
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/checker.ts
View File

@ -21108,8 +21108,11 @@ namespace ts {
signature: Signature,
relation: Map<RelationComparisonResult>,
checkMode: CheckMode,
reportErrors: boolean) {
reportErrors: boolean,
containingMessageChain: (() => DiagnosticMessageChain | undefined) | undefined
) {
if (isJsxOpeningLikeElement(node)) {
// TODO: Maybe containingMessageChain too?
return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors);
}
const thisType = getThisTypeOfSignature(signature);
@ -21137,7 +21140,7 @@ namespace ts {
// we obtain the regular type of any object literal arguments because we may not have inferred complete
// parameter types yet and therefore excess property checks may yield false positives (see #17041).
const checkArgType = checkMode & CheckMode.SkipContextSensitive ? getRegularTypeOfObjectLiteral(argType) : argType;
if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage)) {
if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage, containingMessageChain)) {
return false;
}
}
@ -21475,11 +21478,14 @@ namespace ts {
// skip the checkApplicableSignature check.
if (reportErrors) {
if (candidatesForArgumentError) {
createDiagnosticForNodeFromMessageChain // is what I really want to call
chainDiagnosticMessages(chain, Diagnostics.Failed_to_find_a_suitable_overload_for_this_call);
diagnostics.add(createDiagnosticForNode(node, Diagnostics.Failed_to_find_a_suitable_overload_for_this_call));
// const related: DiagnosticRelatedInformation[] = [];
for (const c of candidatesForArgumentError) {
checkApplicableSignature(node, args, c, assignableRelation, CheckMode.Normal, /*reportErrors*/ true);
const chain = chainDiagnosticMessages(chainDiagnosticMessages(undefined, Diagnostics.Overload_0_gave_the_following_error, signatureToString(c)), Diagnostics.Failed_to_find_a_suitable_overload_for_this_call);
checkApplicableSignature(node, args, c, assignableRelation, CheckMode.Normal, /*reportErrors*/ true, () => chain);
// related.push(argNode)
// This is not right; I want them to be siblings
// probably this is a new feature :(
// chain = chainDiagnosticMessages(chain, msg);
}
}
else if (candidateForArgumentArityError) {
@ -21514,7 +21520,7 @@ namespace ts {
if (typeArguments || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma)) {
return undefined;
}
if (!checkApplicableSignature(node, args, candidate, relation, CheckMode.Normal, /*reportErrors*/ false)) {
if (!checkApplicableSignature(node, args, candidate, relation, CheckMode.Normal, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
candidatesForArgumentError = [candidate];
return undefined;
}
@ -21555,7 +21561,7 @@ namespace ts {
else {
checkCandidate = candidate;
}
if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
// Give preference to error candidates that have no rest parameters (as they are more specific)
if (getMinArgumentCount(checkCandidate) <= args.length && args.length <= getParameterCount(checkCandidate)) {
(candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
@ -21577,7 +21583,7 @@ namespace ts {
continue;
}
}
if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
// Give preference to error candidates that have no rest parameters (as they are more specific)
if (getMinArgumentCount(checkCandidate) <= args.length && args.length <= getParameterCount(checkCandidate)) {
(candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);

4
src/compiler/diagnosticMessages.json
View File

@ -2625,6 +2625,10 @@
"category": "Error",
"code": 2755
},
"Overload '{0}' gave the following error.": {
"category": "Error",
"code": 2756
},
"Import declaration '{0}' is using private name '{1}'.": {
"category": "Error",