Support template literals in rename and find all references

Author: IllusionMH

src/compiler/utilities.ts

@@ -3220,18 +3220,24 @@ namespace ts {
     }
 
     /**
-     * Strip off existed single quotes or double quotes from a given string
+     * Strip off existed surrounding single quotes, double quotes, or backticks from a given string
      *
      * @return non-quoted string
      */
     export function stripQuotes(name: string) {
         const length = name.length;
-        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
+        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && isQuoteOrBacktick(name.charCodeAt(0))) {
             return name.substring(1, length - 1);
         }
         return name;
     }
 
+    function isQuoteOrBacktick(charCode: number) {
+        return charCode === CharacterCodes.singleQuote ||
+            charCode === CharacterCodes.doubleQuote ||
+            charCode === CharacterCodes.backtick;
+    }
+
     export function startsWithQuote(name: string): boolean {
         return isSingleOrDoubleQuote(name.charCodeAt(0));
     }

src/services/findAllReferences.ts

@@ -448,7 +448,7 @@ namespace ts.FindAllReferences {
     function getTextSpan(node: Node, sourceFile: SourceFile, endNode?: Node): TextSpan {
         let start = node.getStart(sourceFile);
         let end = (endNode || node).getEnd();
-        if (node.kind === SyntaxKind.StringLiteral) {
+        if (isStringLiteralLike(node)) {
             Debug.assert(endNode === undefined);
             start += 1;
             end -= 1;
@@ -1234,8 +1234,9 @@ namespace ts.FindAllReferences.Core {
             case SyntaxKind.Identifier:
                 return (node as Identifier).text.length === searchSymbolName.length;
 
+            case SyntaxKind.NoSubstitutionTemplateLiteral:
             case SyntaxKind.StringLiteral: {
-                const str = node as StringLiteral;
+                const str = node as StringLiteralLike;
                 return (isLiteralNameOfPropertyDeclarationOrIndexAccess(str) || isNameOfModuleDeclaration(node) || isExpressionOfExternalModuleImportEqualsDeclaration(node) || (isCallExpression(node.parent) && isBindableObjectDefinePropertyCall(node.parent) && node.parent.arguments[1] === node)) &&
                     str.text.length === searchSymbolName.length;
             }

src/services/rename.ts

@@ -81,7 +81,7 @@ namespace ts.Rename {
     function createTriggerSpanForNode(node: Node, sourceFile: SourceFile) {
         let start = node.getStart(sourceFile);
         let width = node.getWidth(sourceFile);
-        if (node.kind === SyntaxKind.StringLiteral) {
+        if (isStringLiteralLike(node)) {
             // Exclude the quotes
             start += 1;
             width -= 2;
@@ -93,6 +93,7 @@ namespace ts.Rename {
         switch (node.kind) {
             case SyntaxKind.Identifier:
             case SyntaxKind.StringLiteral:
+            case SyntaxKind.NoSubstitutionTemplateLiteral:
             case SyntaxKind.ThisKeyword:
                 return true;
             case SyntaxKind.NumericLiteral:

src/services/services.ts

@@ -2227,6 +2227,7 @@ namespace ts {
     function getContainingObjectLiteralElementWorker(node: Node): ObjectLiteralElement | undefined {
         switch (node.kind) {
             case SyntaxKind.StringLiteral:
+            case SyntaxKind.NoSubstitutionTemplateLiteral:
             case SyntaxKind.NumericLiteral:
                 if (node.parent.kind === SyntaxKind.ComputedPropertyName) {
                     return isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;

src/services/utilities.ts

@@ -267,7 +267,7 @@ namespace ts {
             isFunctionLike(node.parent) && (<FunctionLikeDeclaration>node.parent).name === node;
     }
 
-    export function isLiteralNameOfPropertyDeclarationOrIndexAccess(node: StringLiteral | NumericLiteral): boolean {
+    export function isLiteralNameOfPropertyDeclarationOrIndexAccess(node: StringLiteral | NumericLiteral | NoSubstitutionTemplateLiteral): boolean {
         switch (node.parent.kind) {
             case SyntaxKind.PropertyDeclaration:
             case SyntaxKind.PropertySignature:

tests/cases/fourslash/renameTemplateLiteralsComputedProperties.ts

@@ -0,0 +1,42 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: a.ts
+////interface Obj {
+////    [|[`[|{| "contextRangeIndex": 0 |}num|]`]: number;|]
+////    [|['[|{| "contextRangeIndex": 2 |}bool|]']: boolean;|]
+////}
+////
+////let o: Obj = {
+////    [|[`[|{| "contextRangeIndex": 4 |}num|]`]: 0|],
+////    [|['[|{| "contextRangeIndex": 6 |}bool|]']: true|],
+////};
+////
+////o = {
+////    [|['[|{| "contextRangeIndex": 8 |}num|]']: 1|],
+////    [|[`[|{| "contextRangeIndex": 10 |}bool|]`]: false|],
+////};
+////
+////o.[|num|];
+////o['[|num|]'];
+////o["[|num|]"];
+////o[`[|num|]`];
+////
+////o.[|bool|];
+////o['[|bool|]'];
+////o["[|bool|]"];
+////o[`[|bool|]`];
+////
+////export { o };
+
+// @allowJs: true
+// @Filename: b.js
+////import { o as obj } from './a';
+////
+////obj.[|num|];
+////obj[`[|num|]`];
+////
+////obj.[|bool|];
+////obj[`[|bool|]`];
+
+verify.rangesWithSameTextAreRenameLocations("num");
+verify.rangesWithSameTextAreRenameLocations("bool");

tests/cases/fourslash/renameTemplateLiteralsDefinePropertyJs.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+// @allowJs: true
+// @Filename: a.js
+////let obj = {};
+////
+////Object.defineProperty(obj, `[|prop|]`, { value: 0 });
+////
+////obj = {
+////    [|[`[|{| "contextRangeIndex": 1 |}prop|]`]: 1|]
+////};
+////
+////obj.[|prop|];
+////obj['[|prop|]'];
+////obj["[|prop|]"];
+////obj[`[|prop|]`];
+
+verify.rangesWithSameTextAreRenameLocations('prop');