maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2236 from Microsoft/signatureHelp

Browse source 
Signature help diagnostics
This commit is contained in:
Paul van Brenk 2015-03-06 15:31:20 -08:00
parent 59c3a7d71e 80f9cf299c
commit af41be88a1
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/services/signatureHelp.ts
View file

@ -264,12 +264,16 @@ module ts.SignatureHelp {
// the comma. That amounts to taking the ceiling of half the index. // the comma. That amounts to taking the ceiling of half the index.
var argumentIndex = (listItemInfo.listItemIndex + 1) >> 1; var argumentIndex = (listItemInfo.listItemIndex + 1) >> 1;
var argumentCount = getCommaBasedArgCount(list);
Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`);
return { return {
kind: isTypeArgList ? ArgumentListKind.TypeArguments : ArgumentListKind.CallArguments, kind: isTypeArgList ? ArgumentListKind.TypeArguments : ArgumentListKind.CallArguments,
invocation: callExpression, invocation: callExpression,
argumentsSpan: getApplicableSpanForArguments(list), argumentsSpan: getApplicableSpanForArguments(list),
argumentIndex: argumentIndex, argumentIndex: argumentIndex,
argumentCount: getCommaBasedArgCount(list) argumentCount: argumentCount
}; };
} }
} }
@ -347,6 +351,8 @@ module ts.SignatureHelp {
? 1 ? 1
: (<TemplateExpression>tagExpression.template).templateSpans.length + 1; : (<TemplateExpression>tagExpression.template).templateSpans.length + 1;
Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`);
return { return {
kind: ArgumentListKind.TaggedTemplateArguments, kind: ArgumentListKind.TaggedTemplateArguments,
invocation: tagExpression, invocation: tagExpression,
@ -512,6 +518,8 @@ module ts.SignatureHelp {
selectedItemIndex = selectBestInvalidOverloadIndex(candidates, argumentCount); selectedItemIndex = selectBestInvalidOverloadIndex(candidates, argumentCount);
} }
Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, `argumentCount < argumentIndex, ${argumentCount} < ${argumentIndex}`);
return { return {
items, items,
applicableSpan, applicableSpan,