Fixed bug where tagged templates with a literal adjacent to EOF showed sig help.

DanielRosenwasser · DanielRosenwasser · commit 5fd0701ce52c · 2014-11-25T14:37:51.000-08:00
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -715,7 +715,7 @@ module ts {
                 };
             }
         }
-
+
         function emitEnumDeclaration(node: EnumDeclaration) {
             if (resolver.isDeclarationVisible(node)) {
                 emitJsDocComments(node);
@@ -3558,7 +3558,7 @@ module ts {
                 return leadingComments;
             }
 
-
+
             function getLeadingCommentsToEmit(node: Node) {
                 // Emit the leading comments only if the parent's pos doesn't match because parent should take care of emitting these comments
                 if (node.parent.kind === SyntaxKind.SourceFile || node.pos !== node.parent.pos) {
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -823,9 +823,10 @@ module ts {
             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;
+        // If we didn't end in a backtick, we must still be in the middle of a template literal,
+        // but if it's the *initial* backtick (whereby the token is 1 char long), then it's unclosed.
+        var width = node.end - getTokenPosOfNode(node);
+        return width < 2 || sourceText.charCodeAt(node.end - 1) !== CharacterCodes.backtick;
     }
 
     export function isModifier(token: SyntaxKind): boolean {
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
@@ -296,7 +296,7 @@ module ts.SignatureHelp {
                 Debug.assert(templateExpression.kind === SyntaxKind.TemplateExpression);
 
                 // If we're just after a template tail, don't show signature help.
-                if (node.kind === SyntaxKind.TemplateTail && position >= node.getEnd() && !isUnterminatedTemplateEnd(<LiteralExpression>node)) {
+                if (node.kind === SyntaxKind.TemplateTail && !isInsideTemplateLiteral(<LiteralExpression>node, position)) {
                     return undefined;
                 }
 
diff --git a/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives2.ts b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives2.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+//// function foo(strs, ...rest) {
+//// }
+//// 
+//// /*1*/fo/*2*/o /*3*/`abcd${0 + 1}abcd{1 + 1}`/*4*/  /*5*/
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+    verify.not.signatureHelpPresent();
+});
diff --git a/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives3.ts b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives3.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+//// function foo(strs, ...rest) {
+//// }
+//// 
+//// /*1*/fo/*2*/o /*3*/`abcd${0 + 1}abcd{1 + 1}abcd`/*4*/  /*5*/
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+    verify.not.signatureHelpPresent();
+});
diff --git a/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives4.ts b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives4.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+//// function foo(strs, ...rest) {
+//// }
+//// 
+//// /*1*/fo/*2*/o /*3*/``/*4*/  /*5*/
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+    verify.not.signatureHelpPresent();
+});
diff --git a/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives5.ts b/tests/cases/fourslash/signatureHelpTaggedTemplatesNegatives5.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+//// function foo(strs, ...rest) {
+//// }
+//// 
+//// /*1*/fo/*2*/o /*3*/`abcd`/*4*/  /*5*/
+
+test.markers().forEach(m => {
+    goTo.position(m.position);
+    verify.not.signatureHelpPresent();
+});

Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,7 @@ module ts {`
`715`	`715`	`};`
`716`	`716`	`}`
`717`	`717`	`}`
`718`		`-`
	`718`	`+`
`719`	`719`	`function emitEnumDeclaration(node: EnumDeclaration) {`
`720`	`720`	`if (resolver.isDeclarationVisible(node)) {`
`721`	`721`	`emitJsDocComments(node);`
`@@ -3558,7 +3558,7 @@ module ts {`
`3558`	`3558`	`return leadingComments;`
`3559`	`3559`	`}`
`3560`	`3560`
`3561`		`-`
	`3561`	`+`
`3562`	`3562`	`function getLeadingCommentsToEmit(node: Node) {`
`3563`	`3563`	`// Emit the leading comments only if the parent's pos doesn't match because parent should take care of emitting these comments`
`3564`	`3564`	`if (node.parent.kind === SyntaxKind.SourceFile \|\| node.pos !== node.parent.pos) {`
Original file line number	Diff line number	Diff line change
`@@ -823,9 +823,10 @@ module ts {`
`823`	`823`	`return false;`
`824`	`824`	`}`
`825`	`825`
`826`		`- // If we didn't end in a backtick, we must still be in the middle of a template.`
`827`		`- // If we did, make sure that it's not the initial backtick.`
`828`		`- return sourceText.charCodeAt(node.end - 1) !== CharacterCodes.backtick \|\| node.text.length === 0;`
	`826`	`+ // If we didn't end in a backtick, we must still be in the middle of a template literal,`
	`827`	`+ // but if it's the initial backtick (whereby the token is 1 char long), then it's unclosed.`
	`828`	`+ var width = node.end - getTokenPosOfNode(node);`
	`829`	`+ return width < 2 \|\| sourceText.charCodeAt(node.end - 1) !== CharacterCodes.backtick;`
`829`	`830`	`}`
`830`	`831`
`831`	`832`	`export function isModifier(token: SyntaxKind): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ module ts.SignatureHelp {`
`296`	`296`	`Debug.assert(templateExpression.kind === SyntaxKind.TemplateExpression);`
`297`	`297`
`298`	`298`	`// If we're just after a template tail, don't show signature help.`
`299`		`- if (node.kind === SyntaxKind.TemplateTail && position >= node.getEnd() && !isUnterminatedTemplateEnd(<LiteralExpression>node)) {`
	`299`	`+ if (node.kind === SyntaxKind.TemplateTail && !isInsideTemplateLiteral(<LiteralExpression>node, position)) {`
`300`	`300`	`return undefined;`
`301`	`301`	`}`
`302`	`302`