Don't need types to handle string literals

Andy Hanson · Andy Hanson · commit 5bcb8fa9fa33 · 2017-03-21T13:24:39.000-07:00
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
@@ -279,7 +279,7 @@ namespace ts.FindAllReferences.Core {
         if (!symbol) {
             // String literal might be a property (and thus have a symbol), so do this here rather than in getReferencedSymbolsSpecial.
             if (!options.implementations && node.kind === SyntaxKind.StringLiteral) {
-                return getReferencesForStringLiteral(<StringLiteral>node, sourceFiles, checker, cancellationToken);
+                return getReferencesForStringLiteral(<StringLiteral>node, sourceFiles, cancellationToken);
             }
             // Can't have references to something that we have no symbol for.
             return undefined;
@@ -1328,37 +1328,24 @@ namespace ts.FindAllReferences.Core {
         }
     }
 
-    function getReferencesForStringLiteral(node: StringLiteral, sourceFiles: SourceFile[], checker: TypeChecker, cancellationToken: CancellationToken): SymbolAndEntries[] {
-        const type = getStringLiteralTypeForNode(node, checker);
-
-        if (!type) {
-            // nothing to do here. moving on
-            return undefined;
-        }
-
+    function getReferencesForStringLiteral(node: StringLiteral, sourceFiles: SourceFile[], cancellationToken: CancellationToken): SymbolAndEntries[] {
         const references: NodeEntry[] = [];
 
         for (const sourceFile of sourceFiles) {
-            const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, type.text, sourceFile.getStart(), sourceFile.getEnd(), cancellationToken);
-            getReferencesForStringLiteralInFile(sourceFile, type, possiblePositions, references);
+            cancellationToken.throwIfCancellationRequested();
+            const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, node.text, sourceFile.getStart(), sourceFile.getEnd(), cancellationToken);
+            getReferencesForStringLiteralInFile(sourceFile, node.text, possiblePositions, references);
         }
 
         return [{
             definition: { type: "string", node },
             references
         }];
 
-        function getReferencesForStringLiteralInFile(sourceFile: SourceFile, searchType: Type, possiblePositions: number[], references: Push<NodeEntry>): void {
+        function getReferencesForStringLiteralInFile(sourceFile: SourceFile, searchText: string, possiblePositions: number[], references: Push<NodeEntry>): void {
             for (const position of possiblePositions) {
-                cancellationToken.throwIfCancellationRequested();
-
                 const node = getTouchingWord(sourceFile, position);
-                if (!node || node.kind !== SyntaxKind.StringLiteral) {
-                    return;
-                }
-
-                const type = getStringLiteralTypeForNode(<StringLiteral>node, checker);
-                if (type === searchType) {
+                if (node && node.kind === SyntaxKind.StringLiteral && (node as StringLiteral).text === searchText) {
                     references.push(nodeEntry(node, /*isInString*/true));
                 }
             }
diff --git a/src/services/rename.ts b/src/services/rename.ts
@@ -37,15 +37,12 @@ namespace ts.Rename {
             }
         }
         else if (node.kind === SyntaxKind.StringLiteral) {
-            const type = getStringLiteralTypeForNode(<StringLiteral>node, typeChecker);
-            if (type) {
-                if (isDefinedInLibraryFile(node)) {
-                    return getRenameInfoError(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
-                }
-
-                const displayName = stripQuotes(type.text);
-                return getRenameInfoSuccess(displayName, displayName, ScriptElementKind.variableElement, ScriptElementKindModifier.none, node, sourceFile);
+            if (isDefinedInLibraryFile(node)) {
+                return getRenameInfoError(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
             }
+
+            const displayName = stripQuotes((node as StringLiteral).text);
+            return getRenameInfoSuccess(displayName, displayName, ScriptElementKind.variableElement, ScriptElementKindModifier.none, node, sourceFile);
         }
     }
 
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -364,15 +364,6 @@ namespace ts {
         }
     }
 
-    export function getStringLiteralTypeForNode(node: StringLiteral | LiteralTypeNode, typeChecker: TypeChecker): LiteralType {
-        const searchNode = node.parent.kind === SyntaxKind.LiteralType ? <LiteralTypeNode>node.parent : node;
-        const type = typeChecker.getTypeAtLocation(searchNode);
-        if (type && type.flags & TypeFlags.StringLiteral) {
-            return <LiteralType>type;
-        }
-        return undefined;
-    }
-
     export function isThis(node: Node): boolean {
         switch (node.kind) {
             case SyntaxKind.ThisKeyword:

Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,12 @@ namespace ts.Rename {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`else if (node.kind === SyntaxKind.StringLiteral) {`
`40`		`- const type = getStringLiteralTypeForNode(<StringLiteral>node, typeChecker);`
`41`		`- if (type) {`
`42`		`- if (isDefinedInLibraryFile(node)) {`
`43`		`- return getRenameInfoError(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);`
`44`		`- }`
`45`		`-`
`46`		`- const displayName = stripQuotes(type.text);`
`47`		`- return getRenameInfoSuccess(displayName, displayName, ScriptElementKind.variableElement, ScriptElementKindModifier.none, node, sourceFile);`
	`40`	`+ if (isDefinedInLibraryFile(node)) {`
	`41`	`+ return getRenameInfoError(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);`
`48`	`42`	`}`
	`43`	`+`
	`44`	`+ const displayName = stripQuotes((node as StringLiteral).text);`
	`45`	`+ return getRenameInfoSuccess(displayName, displayName, ScriptElementKind.variableElement, ScriptElementKindModifier.none, node, sourceFile);`
`49`	`46`	`}`
`50`	`47`	`}`
`51`	`48`