microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-18 12:21:37 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Moved call for getSpreadArgumentIndex in hasCorrectArity

Browse Source
This commit is contained in:
Ron Buckton 2015-05-29 11:00:19 -07:00
parent f559d061ec
commit 87d0af10d0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/checker.ts
View File

@ -6628,6 +6628,7 @@ module ts {
let typeArguments: NodeArray<TypeNode>; // Type arguments (undefined if none)
let callIsIncomplete: boolean; // In incomplete call we want to be lenient when we have too few arguments
let isDecorator: boolean;
let spreadArgIndex = -1;
if (node.kind === SyntaxKind.TaggedTemplateExpression) {
let tagExpression = <TaggedTemplateExpression>node;
@ -6675,6 +6676,7 @@ module ts {
callIsIncomplete = (<CallExpression>callExpression).arguments.end === callExpression.end;
typeArguments = callExpression.typeArguments;
spreadArgIndex = getSpreadArgumentIndex(args);
}
// If the user supplied type arguments, but the number of type arguments does not match
@ -6687,7 +6689,6 @@ module ts {
// If spread arguments are present, check that they correspond to a rest parameter. If so, no
// further checking is necessary.
let spreadArgIndex = !isDecorator ? getSpreadArgumentIndex(args) : -1;
if (spreadArgIndex >= 0) {
return signature.hasRestParameter && spreadArgIndex >= signature.parameters.length - 1;
}

1
src/compiler/diagnosticMessages.json
View File

@ -691,7 +691,6 @@
"category": "Error",
"code": 1220
},
"Unable to resolve signature of class decorator when called as an expression.": {
"category": "Error",
"code": 1221