findAllRefs: Find string references inside of template strings (microsoft#16723)

Andy · web-flow · commit 42e08f557801 · 2017-06-28T12:53:12.000-07:00
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -4743,6 +4743,19 @@ namespace ts {
             || kind === SyntaxKind.TemplateTail;
     }
 
+    export function isStringTextContainingNode(node: Node) {
+        switch (node.kind) {
+            case SyntaxKind.StringLiteral:
+            case SyntaxKind.TemplateHead:
+            case SyntaxKind.TemplateMiddle:
+            case SyntaxKind.TemplateTail:
+            case SyntaxKind.NoSubstitutionTemplateLiteral:
+                return true;
+            default:
+                return false;
+        }
+    }
+
     // Identifiers
 
     /* @internal */
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -787,7 +787,7 @@ namespace ts {
 
     export function isInString(sourceFile: SourceFile, position: number): boolean {
         const previousToken = findPrecedingToken(position, sourceFile);
-        if (previousToken && previousToken.kind === SyntaxKind.StringLiteral) {
+        if (previousToken && isStringTextContainingNode(previousToken)) {
             const start = previousToken.getStart();
             const end = previousToken.getEnd();
 
diff --git a/tests/cases/fourslash/renameCommentsAndStrings4.ts b/tests/cases/fourslash/renameCommentsAndStrings4.ts
@@ -2,9 +2,14 @@
 
 ///////<reference path="./Bar.ts" />
 
-////function /**/[|Bar|]() {
+////function [|Bar|]() {
 ////    // This is a reference to [|Bar|] in a comment.
-////    "this is a reference to [|Bar|] in a string"
+////    "this is a reference to [|Bar|] in a string";
+////    `Foo [|Bar|] Baz.`;
+////    {
+////        const Bar = 0;
+////        `[|Bar|] ba ${Bar} bara [|Bar|] berbobo ${Bar} araura [|Bar|] ara!`;
+////    }
 ////}
 
 const ranges = test.ranges();
