Perform checking and resolution of tagged template type arguments.

DanielRosenwasser · DanielRosenwasser · commit 82e09c908e3c · 2018-04-13T23:45:17.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17749,7 +17749,11 @@ namespace ts {
 
             let typeArguments: NodeArray<TypeNode>;
 
-            if (!isTaggedTemplate && !isDecorator && !isJsxOpeningOrSelfClosingElement) {
+            if (isTaggedTemplate) {
+                typeArguments = (node as TaggedTemplateExpression).typeArguments;
+                forEach(typeArguments, checkSourceElement);
+            }
+            else if (!isDecorator && !isJsxOpeningOrSelfClosingElement) {
                 typeArguments = (<CallExpression>node).typeArguments;
 
                 // We already perform checking on the type arguments on the class declaration itself.
@@ -17866,7 +17870,7 @@ namespace ts {
                 checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, /*excludeArgument*/ undefined, /*reportErrors*/ true);
             }
             else if (candidateForTypeArgumentError) {
-                checkTypeArguments(candidateForTypeArgumentError, (node as CallExpression).typeArguments, /*reportErrors*/ true, fallbackError);
+                checkTypeArguments(candidateForTypeArgumentError, (node as CallExpression | TaggedTemplateExpression).typeArguments, /*reportErrors*/ true, fallbackError);
             }
             else if (typeArguments && every(signatures, sig => length(sig.typeParameters) !== typeArguments.length)) {
                 diagnostics.add(getTypeArgumentArityError(node, signatures, typeArguments));
@@ -18660,6 +18664,7 @@ namespace ts {
         }
 
         function checkTaggedTemplateExpression(node: TaggedTemplateExpression): Type {
+            checkGrammarTypeArguments(node, node.typeArguments);
             if (languageVersion < ScriptTarget.ES2015) {
                 checkExternalEmitHelpers(node, ExternalEmitHelpers.MakeTemplateObject);
             }

Original file line number	Diff line number	Diff line change
`@@ -17749,7 +17749,11 @@ namespace ts {`
`17749`	`17749`
`17750`	`17750`	`let typeArguments: NodeArray<TypeNode>;`
`17751`	`17751`
`17752`		`- if (!isTaggedTemplate && !isDecorator && !isJsxOpeningOrSelfClosingElement) {`
	`17752`	`+ if (isTaggedTemplate) {`
	`17753`	`+ typeArguments = (node as TaggedTemplateExpression).typeArguments;`
	`17754`	`+ forEach(typeArguments, checkSourceElement);`
	`17755`	`+ }`
	`17756`	`+ else if (!isDecorator && !isJsxOpeningOrSelfClosingElement) {`
`17753`	`17757`	`typeArguments = (<CallExpression>node).typeArguments;`
`17754`	`17758`
`17755`	`17759`	`// We already perform checking on the type arguments on the class declaration itself.`
`@@ -17866,7 +17870,7 @@ namespace ts {`
`17866`	`17870`	`checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, /excludeArgument/ undefined, /reportErrors/ true);`
`17867`	`17871`	`}`
`17868`	`17872`	`else if (candidateForTypeArgumentError) {`
`17869`		`- checkTypeArguments(candidateForTypeArgumentError, (node as CallExpression).typeArguments, /reportErrors/ true, fallbackError);`
	`17873`	`+ checkTypeArguments(candidateForTypeArgumentError, (node as CallExpression \| TaggedTemplateExpression).typeArguments, /reportErrors/ true, fallbackError);`
`17870`	`17874`	`}`
`17871`	`17875`	`else if (typeArguments && every(signatures, sig => length(sig.typeParameters) !== typeArguments.length)) {`
`17872`	`17876`	`diagnostics.add(getTypeArgumentArityError(node, signatures, typeArguments));`
`@@ -18660,6 +18664,7 @@ namespace ts {`
`18660`	`18664`	`}`
`18661`	`18665`
`18662`	`18666`	`function checkTaggedTemplateExpression(node: TaggedTemplateExpression): Type {`
	`18667`	`+ checkGrammarTypeArguments(node, node.typeArguments);`
`18663`	`18668`	`if (languageVersion < ScriptTarget.ES2015) {`
`18664`	`18669`	`checkExternalEmitHelpers(node, ExternalEmitHelpers.MakeTemplateObject);`
`18665`	`18670`	`}`