From 06d7230624e0adff610569e543779564bfca920d Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Tue, 29 May 2018 16:03:06 -0700
Subject: [PATCH] Don't allow to rename string literal

---
 src/services/rename.ts                        | 50 ++++++++-----------
 .../fourslash/renameStringLiteralTypes.ts     |  2 +-
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/services/rename.ts b/src/services/rename.ts
index efebe72d50f6b..ab83baf167668 100644
--- a/src/services/rename.ts
+++ b/src/services/rename.ts
@@ -21,39 +21,31 @@ namespace ts.Rename {
 
     function getRenameInfoForNode(node: Node, typeChecker: TypeChecker, sourceFile: SourceFile, isDefinedInLibraryFile: (declaration: Node) => boolean): RenameInfo | undefined {
         const symbol = typeChecker.getSymbolAtLocation(node);
-
+        if (!symbol) return;
         // Only allow a symbol to be renamed if it actually has at least one declaration.
-        if (symbol) {
-            const { declarations } = symbol;
-            if (declarations && declarations.length > 0) {
-                // Disallow rename for elements that are defined in the standard TypeScript library.
-                if (declarations.some(isDefinedInLibraryFile)) {
-                    return getRenameInfoError(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
-                }
-
-                // Cannot rename `default` as in `import { default as foo } from "./someModule";
-                if (isIdentifier(node) && node.originalKeywordKind === SyntaxKind.DefaultKeyword && symbol.parent!.flags & SymbolFlags.Module) {
-                    return undefined;
-                }
-
-                // Can't rename a module name.
-                if (isStringLiteralLike(node) && tryGetImportFromModuleSpecifier(node)) return undefined;
+        const { declarations } = symbol;
+        if (!declarations || declarations.length === 0) return;
 
-                const kind = SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
-                const specifierName = (isImportOrExportSpecifierName(node) || isStringOrNumericLiteral(node) && node.parent.kind === SyntaxKind.ComputedPropertyName)
-                    ? stripQuotes(getTextOfIdentifierOrLiteral(node))
-                    : undefined;
-                const displayName = specifierName || typeChecker.symbolToString(symbol);
-                const fullDisplayName = specifierName || typeChecker.getFullyQualifiedName(symbol);
-                return getRenameInfoSuccess(displayName, fullDisplayName, kind, SymbolDisplay.getSymbolModifiers(symbol), node, sourceFile);
-            }
+        // Disallow rename for elements that are defined in the standard TypeScript library.
+        if (declarations.some(isDefinedInLibraryFile)) {
+            return getRenameInfoError(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
         }
-        else if (isStringLiteral(node)) {
-            if (isDefinedInLibraryFile(node)) {
-                return getRenameInfoError(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
-            }
-            return getRenameInfoSuccess(node.text, node.text, ScriptElementKind.variableElement, ScriptElementKindModifier.none, node, sourceFile);
+
+        // Cannot rename `default` as in `import { default as foo } from "./someModule";
+        if (isIdentifier(node) && node.originalKeywordKind === SyntaxKind.DefaultKeyword && symbol.parent!.flags & SymbolFlags.Module) {
+            return undefined;
         }
+
+        // Can't rename a module name.
+        if (isStringLiteralLike(node) && tryGetImportFromModuleSpecifier(node)) return undefined;
+
+        const kind = SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
+        const specifierName = (isImportOrExportSpecifierName(node) || isStringOrNumericLiteral(node) && node.parent.kind === SyntaxKind.ComputedPropertyName)
+            ? stripQuotes(getTextOfIdentifierOrLiteral(node))
+            : undefined;
+        const displayName = specifierName || typeChecker.symbolToString(symbol);
+        const fullDisplayName = specifierName || typeChecker.getFullyQualifiedName(symbol);
+        return getRenameInfoSuccess(displayName, fullDisplayName, kind, SymbolDisplay.getSymbolModifiers(symbol), node, sourceFile);
     }
 
     function getRenameInfoSuccess(displayName: string, fullDisplayName: string, kind: ScriptElementKind, kindModifiers: string, node: Node, sourceFile: SourceFile): RenameInfo {
diff --git a/tests/cases/fourslash/renameStringLiteralTypes.ts b/tests/cases/fourslash/renameStringLiteralTypes.ts
index d0e7368f25da3..ef2b7bb76adc9 100644
--- a/tests/cases/fourslash/renameStringLiteralTypes.ts
+++ b/tests/cases/fourslash/renameStringLiteralTypes.ts
@@ -11,4 +11,4 @@
 ////
 ////animate({ deltaX: 100, deltaY: 100, easing: "[|ease-in-out|]" });
 
-verify.rangesAreRenameLocations();
+goTo.eachRange(() => { verify.renameInfoFailed(); });