Tagged Template Signature Help Support in Language Service

src/compiler/parser.ts

@@ -487,6 +487,15 @@ module ts {
         }
     }
 
+    export function getInvokedExpression(node: CallLikeExpression): Expression {
+        if (node.kind === SyntaxKind.TaggedTemplateExpression) {
+            return (<TaggedTemplateExpression>node).tag;
+        }
+
+        // Will either be a CallExpression or NewExpression.
+        return (<CallExpression>node).func;
+    }
+
     export function isExpression(node: Node): boolean {
         switch (node.kind) {
             case SyntaxKind.ThisKeyword:
@@ -801,14 +810,19 @@ module ts {
     }
 
     export function isUnterminatedTemplateEnd(node: LiteralExpression) {
-        Debug.assert(node.kind === SyntaxKind.NoSubstitutionTemplateLiteral || node.kind === SyntaxKind.TemplateTail);
+        Debug.assert(isTemplateLiteralKind(node.kind));
         var sourceText = getSourceFileOfNode(node).text;
 
         // If we're not at the EOF, we know we must be terminated.
         if (node.end !== sourceText.length) {
             return false;
         }
 
+        // The literal can only be unterminated if it is a template tail or a no-sub template.
+        if (node.kind !== SyntaxKind.TemplateTail && node.kind !== SyntaxKind.NoSubstitutionTemplateLiteral) {
+            return false;
+        }
+
         // If we didn't end in a backtick, we must still be in the middle of a template.
         // If we did, make sure that it's not the *initial* backtick.
         return sourceText.charCodeAt(node.end - 1) !== CharacterCodes.backtick || node.text.length === 0;

src/compiler/types.ts

@@ -758,7 +758,7 @@ module ts {
         getAugmentedPropertiesOfType(type: Type): Symbol[];
         getRootSymbols(symbol: Symbol): Symbol[];
         getContextualType(node: Node): Type;
-        getResolvedSignature(node: CallExpression, candidatesOutArray?: Signature[]): Signature;
+        getResolvedSignature(node: CallLikeExpression, candidatesOutArray?: Signature[]): Signature;
         getSignatureFromDeclaration(declaration: SignatureDeclaration): Signature;
         isImplementationOfOverload(node: FunctionLikeDeclaration): boolean;
         isUndefinedSymbol(symbol: Symbol): boolean;

src/services/utilities.ts

@@ -320,4 +320,9 @@ module ts {
     export function isPunctuation(kind: SyntaxKind): boolean {
         return SyntaxKind.FirstPunctuation <= kind && kind <= SyntaxKind.LastPunctuation;
     }
+
+    export function isInsideTemplateLiteral(node: LiteralExpression, position: number) {
+        return (node.getStart() < position && position < node.getEnd())
+            || (isUnterminatedTemplateEnd(node) && position === node.getEnd());
+    }
 }

tests/cases/fourslash/fourslash.ts

@@ -301,11 +301,11 @@ module FourSlashInterface {
             FourSlash.currentTestState.verifySignatureHelpArgumentCount(expected);
         }
 
-        public currentSignatureParamterCountIs(expected: number) {
+        public currentSignatureParameterCountIs(expected: number) {
             FourSlash.currentTestState.verifyCurrentSignatureHelpParameterCount(expected);
         }
 
-        public currentSignatureTypeParamterCountIs(expected: number) {
+        public currentSignatureTypeParameterCountIs(expected: number) {
             FourSlash.currentTestState.verifyCurrentSignatureHelpTypeParameterCount(expected);
         }
 

tests/cases/fourslash/genericParameterHelp.ts

@@ -14,7 +14,7 @@
 ////testFunction<, ,/*5*/>(null, null, null);
 
 // goTo.marker("1");
-//  verify.currentSignatureParamterCountIs(3);
+//  verify.currentSignatureParameterCountIs(3);
 //  verify.currentSignatureHelpIs("testFunction<T extends IFoo, U, M extends IFoo>(a: T, b: U, c: M): M");
 
 //  verify.currentParameterHelpArgumentNameIs("T");

tests/cases/fourslash/signatureHelpAnonymousFunction.ts

@@ -7,7 +7,7 @@
 
 goTo.marker('anonymousFunction1');
 verify.signatureHelpCountIs(1);
-verify.currentSignatureParamterCountIs(2);
+verify.currentSignatureParameterCountIs(2);
 verify.currentSignatureHelpIs('(a: number, b: string): string');
 verify.currentParameterHelpArgumentNameIs("a");
 verify.currentParameterSpanIs("a: number");

tests/cases/fourslash/signatureHelpAtEOF.ts

@@ -10,6 +10,6 @@ verify.signatureHelpPresent();
 verify.signatureHelpCountIs(1);
 
 verify.currentSignatureHelpIs("Foo(arg1: string, arg2: string): void");
-verify.currentSignatureParamterCountIs(2);
+verify.currentSignatureParameterCountIs(2);
 verify.currentParameterHelpArgumentNameIs("arg1");
 verify.currentParameterSpanIs("arg1: string");

tests/cases/fourslash/signatureHelpBeforeSemicolon1.ts

@@ -10,6 +10,6 @@ verify.signatureHelpPresent();
 verify.signatureHelpCountIs(1);
 
 verify.currentSignatureHelpIs("Foo(arg1: string, arg2: string): void");
-verify.currentSignatureParamterCountIs(2);
+verify.currentSignatureParameterCountIs(2);
 verify.currentParameterHelpArgumentNameIs("arg1");
 verify.currentParameterSpanIs("arg1: string");

tests/cases/fourslash/signatureHelpCallExpression.ts

@@ -5,7 +5,7 @@
 
 goTo.marker('1');
 verify.signatureHelpCountIs(1);
-verify.currentSignatureParamterCountIs(2);
+verify.currentSignatureParameterCountIs(2);
 verify.currentSignatureHelpIs('fnTest(str: string, num: number): void');
 
 verify.currentParameterHelpArgumentNameIs('str');

tests/cases/fourslash/signatureHelpConstructExpression.ts

@@ -6,7 +6,7 @@
 goTo.marker('1');
 verify.signatureHelpCountIs(1);
 
-verify.currentSignatureParamterCountIs(2);
+verify.currentSignatureParameterCountIs(2);
 verify.currentSignatureHelpIs('sampleCls(str: string, num: number): sampleCls');
 
 verify.currentParameterHelpArgumentNameIs('str');

tests/cases/fourslash/signatureHelpConstructorInheritance.ts

@@ -16,7 +16,7 @@
 
 goTo.marker('indirectSuperCall');
 verify.signatureHelpCountIs(2);
-verify.currentSignatureParamterCountIs(1);
+verify.currentSignatureParameterCountIs(1);
 verify.currentSignatureHelpIs('B2(n: number): B2');
 verify.currentParameterHelpArgumentNameIs("n");
 verify.currentParameterSpanIs("n: number");

tests/cases/fourslash/signatureHelpConstructorOverload.ts

@@ -6,11 +6,11 @@
 
 goTo.marker('1');
 verify.signatureHelpCountIs(2);
-verify.currentSignatureParamterCountIs(0);
+verify.currentSignatureParameterCountIs(0);
 verify.currentSignatureHelpIs('clsOverload(): clsOverload');
 
 goTo.marker('2');
-verify.currentSignatureParamterCountIs(1);
+verify.currentSignatureParameterCountIs(1);
 verify.currentSignatureHelpIs('clsOverload(test: string): clsOverload');
 verify.currentParameterHelpArgumentNameIs('test');
 verify.currentParameterSpanIs("test: string");

tests/cases/fourslash/signatureHelpEmptyList.ts

@@ -12,7 +12,7 @@ verify.signatureHelpPresent();
 verify.signatureHelpCountIs(1);
 
 verify.currentSignatureHelpIs("Foo(arg1: string, arg2: string): void");
-verify.currentSignatureParamterCountIs(2);
+verify.currentSignatureParameterCountIs(2);
 verify.currentParameterHelpArgumentNameIs("arg1");
 verify.currentParameterSpanIs("arg1: string");
 

tests/cases/fourslash/signatureHelpFunctionOverload.ts

@@ -8,11 +8,11 @@
 
 goTo.marker('functionOverload1');
 verify.signatureHelpCountIs(2);
-verify.currentSignatureParamterCountIs(0);
+verify.currentSignatureParameterCountIs(0);
 verify.currentSignatureHelpIs('functionOverload(): any');
 
 goTo.marker('functionOverload2');
-verify.currentSignatureParamterCountIs(1);
+verify.currentSignatureParameterCountIs(1);
 verify.currentSignatureHelpIs('functionOverload(test: string): any');
 verify.currentParameterHelpArgumentNameIs("test");
 verify.currentParameterSpanIs("test: string");

tests/cases/fourslash/signatureHelpFunctionParameter.ts

@@ -6,7 +6,7 @@
 
 goTo.marker('parameterFunction1');
 verify.signatureHelpCountIs(1);
-verify.currentSignatureParamterCountIs(2);
+verify.currentSignatureParameterCountIs(2);
 verify.currentSignatureHelpIs('callback(a: number, b: string): void');
 verify.currentParameterHelpArgumentNameIs("a");
 verify.currentParameterSpanIs("a: number");

tests/cases/fourslash/signatureHelpImplicitConstructor.ts

@@ -7,4 +7,4 @@
 goTo.marker();
 verify.signatureHelpCountIs(1);
 verify.currentSignatureHelpIs("ImplicitConstructor(): ImplicitConstructor");
-verify.currentSignatureParamterCountIs(0);
+verify.currentSignatureParameterCountIs(0);

tests/cases/fourslash/signatureHelpIncompleteCalls.ts

@@ -17,13 +17,13 @@
 
 goTo.marker('incompleteCalls1');
 verify.currentSignatureHelpIs("f1(): void");
-verify.currentSignatureParamterCountIs(0);
+verify.currentSignatureParameterCountIs(0);
 
 goTo.marker('incompleteCalls2');
-verify.currentSignatureParamterCountIs(1);
+verify.currentSignatureParameterCountIs(1);
 verify.currentSignatureHelpIs("f2(n: number): number");
 goTo.marker('incompleteCalls3');
-verify.currentSignatureParamterCountIs(2);
+verify.currentSignatureParameterCountIs(2);
 verify.currentSignatureHelpIs("f3(n: number, s: string): string");
 
 verify.currentParameterHelpArgumentNameIs("s");

tests/cases/fourslash/signatureHelpObjectLiteral.ts

@@ -1,17 +1,17 @@
 /// <reference path='fourslash.ts' />
 
 ////var objectLiteral = { n: 5, s: "", f: (a: number, b: string) => "" };
-////objectLiteral.f(/*objectLiteral1*/4, /*objectLiteral2*/"");
-
-goTo.marker('objectLiteral1');
-verify.signatureHelpCountIs(1);
-verify.currentSignatureParamterCountIs(2);
-verify.currentSignatureHelpIs('f(a: number, b: string): string');
-
-verify.currentParameterHelpArgumentNameIs("a");
-verify.currentParameterSpanIs("a: number");
-
-goTo.marker('objectLiteral2');
-verify.currentSignatureHelpIs('f(a: number, b: string): string');
+////objectLiteral.f(/*objectLiteral1*/4, /*objectLiteral2*/"");
+
+goTo.marker('objectLiteral1');
+verify.signatureHelpCountIs(1);
+verify.currentSignatureParameterCountIs(2);
+verify.currentSignatureHelpIs('f(a: number, b: string): string');
+
+verify.currentParameterHelpArgumentNameIs("a");
+verify.currentParameterSpanIs("a: number");
+
+goTo.marker('objectLiteral2');
+verify.currentSignatureHelpIs('f(a: number, b: string): string');
 verify.currentParameterHelpArgumentNameIs("b");
 verify.currentParameterSpanIs("b: string");

tests/cases/fourslash/signatureHelpOnOverloadsDifferentArity3.ts

@@ -10,17 +10,17 @@
 goTo.marker();
 verify.signatureHelpCountIs(4);
 verify.currentSignatureHelpIs("f(): any");
-verify.currentSignatureParamterCountIs(0);
+verify.currentSignatureParameterCountIs(0);
 verify.signatureHelpArgumentCountIs(0);
 
 edit.insert(", ");
 verify.signatureHelpCountIs(4);
 verify.currentSignatureHelpIs("f(s: string, b: boolean): any");
-verify.currentSignatureParamterCountIs(2);
+verify.currentSignatureParameterCountIs(2);
 verify.currentParameterHelpArgumentNameIs("b");
 verify.currentParameterSpanIs("b: boolean");
 
 edit.insert(", ");
 verify.signatureHelpCountIs(4);
 verify.currentSignatureHelpIs("f(s: string, b: boolean): any");
-verify.currentSignatureParamterCountIs(2);
+verify.currentSignatureParameterCountIs(2);

tests/cases/fourslash/signatureHelpSuperConstructorOverload.ts

@@ -20,9 +20,9 @@
 goTo.marker('superOverload1');
 verify.signatureHelpCountIs(2);
 verify.currentSignatureHelpIs("SuperOverloadlBase(): SuperOverloadlBase");
-verify.currentSignatureParamterCountIs(0);
+verify.currentSignatureParameterCountIs(0);
 goTo.marker('superOverload2');
-verify.currentSignatureParamterCountIs(1);
+verify.currentSignatureParameterCountIs(1);
 verify.currentSignatureHelpIs("SuperOverloadlBase(test: string): SuperOverloadlBase");
 verify.currentParameterHelpArgumentNameIs("test");
 verify.currentParameterSpanIs("test: string");

tests/cases/fourslash/signatureHelpTaggedTemplates1.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+//// function f(templateStrings, x, y, z) { return 10; }
+//// function g(templateStrings, x, y, z) { return ""; }
+//// 
+//// f `/*1*/ qwe/*2*/rty /*3*/$/*4*/{ 123 }/*5*/ as/*6*/df /*7*/$/*8*/{   41234   }/*9*/  zxc/*10*/vb /*11*/$/*12*/{ g `    ` }/*13*/  /*14*/  /*15*/`
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+
+    verify.signatureHelpCountIs(1);
+    verify.signatureHelpArgumentCountIs(4);
+
+    verify.currentSignatureParameterCountIs(4);
+    verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
+    verify.currentParameterHelpArgumentNameIs("templateStrings");
+    verify.currentParameterSpanIs("templateStrings: any");
+});

tests/cases/fourslash/signatureHelpTaggedTemplates2.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+//// function f(templateStrings, x, y, z) { return 10; }
+//// function g(templateStrings, x, y, z) { return ""; }
+//// 
+//// f `/*1*/ qwe/*2*/rty /*3*/$/*4*/{ 123 }/*5*/ as/*6*/df /*7*/$/*8*/{   41234   }/*9*/  zxc/*10*/vb /*11*/$/*12*/{ g `    ` }/*13*/  /*14*/  /*15*/
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+
+    verify.signatureHelpCountIs(1);
+    verify.signatureHelpArgumentCountIs(4);
+
+    verify.currentSignatureParameterCountIs(4);
+    verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
+    verify.currentParameterHelpArgumentNameIs("templateStrings");
+    verify.currentParameterSpanIs("templateStrings: any");
+});

tests/cases/fourslash/signatureHelpTaggedTemplates3.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+//// function f(templateStrings, x, y, z) { return 10; }
+//// function g(templateStrings, x, y, z) { return ""; }
+//// 
+//// f ` qwerty ${/*1*/ /*2*/123/*3*/ /*4*/} asdf ${   41234   }  zxcvb ${ g `    ` }    `
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+
+    verify.signatureHelpCountIs(1);
+    verify.signatureHelpArgumentCountIs(4);
+
+    verify.currentSignatureParameterCountIs(4);
+    verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
+    verify.currentParameterHelpArgumentNameIs("x");
+    verify.currentParameterSpanIs("x: any");
+});

tests/cases/fourslash/signatureHelpTaggedTemplates4.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+//// function f(templateStrings, x, y, z) { return 10; }
+//// function g(templateStrings, x, y, z) { return ""; }
+//// 
+//// f ` qwerty ${ 123 } asdf ${/*1*/  /*2*/ /*3*/41/*4*/234/*5*/   /*6*/}  zxcvb ${ g `    ` }    `
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+
+    verify.signatureHelpCountIs(1);
+    verify.signatureHelpArgumentCountIs(4);
+
+    verify.currentSignatureParameterCountIs(4);
+    verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
+    verify.currentParameterHelpArgumentNameIs("y");
+    verify.currentParameterSpanIs("y: any");
+});

tests/cases/fourslash/signatureHelpTaggedTemplates5.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+//// function f(templateStrings, x, y, z) { return 10; }
+//// function g(templateStrings, x, y, z) { return ""; }
+//// 
+//// f ` qwerty ${ 123 } asdf ${   41234   }  zxcvb ${/*1*/ /*2*/g/*3*/ /*4*/`    `/*5*/ /*6*/}    `
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+
+    verify.signatureHelpCountIs(1);
+    verify.signatureHelpArgumentCountIs(4);
+
+    verify.currentSignatureParameterCountIs(4);
+    verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
+    verify.currentParameterHelpArgumentNameIs("z");
+    verify.currentParameterSpanIs("z: any");
+});

tests/cases/fourslash/signatureHelpTaggedTemplates6.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+//// function f(templateStrings, x, y, z) { return 10; }
+//// function g(templateStrings, x, y, z) { return ""; }
+//// 
+//// f ` qwerty ${ 123 } asdf ${   41234   }  zxcvb ${ g `/*1*/ /*2*/   /*3*/` }    `
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+
+    verify.signatureHelpCountIs(1);
+    verify.signatureHelpArgumentCountIs(1);
+
+    verify.currentSignatureParameterCountIs(4);
+    verify.currentSignatureHelpIs('g(templateStrings: any, x: any, y: any, z: any): string');
+    verify.currentParameterHelpArgumentNameIs("templateStrings");
+    verify.currentParameterSpanIs("templateStrings: any");
+});