rename: Re-use code for isDefinedInLibraryFile (microsoft#25367)

Andy · web-flow · commit dc2dc8d5390e · 2018-07-02T12:25:27.000-07:00
diff --git a/src/services/rename.ts b/src/services/rename.ts
@@ -1,22 +1,11 @@
 /* @internal */
 namespace ts.Rename {
-    export function getRenameInfo(typeChecker: TypeChecker, defaultLibFileName: string, getCanonicalFileName: GetCanonicalFileName, sourceFile: SourceFile, position: number): RenameInfo {
-        const getCanonicalDefaultLibName = memoize(() => getCanonicalFileName(normalizePath(defaultLibFileName)));
+    export function getRenameInfo(program: Program, sourceFile: SourceFile, position: number): RenameInfo {
         const node = getTouchingPropertyName(sourceFile, position);
         const renameInfo = node && nodeIsEligibleForRename(node)
-            ? getRenameInfoForNode(node, typeChecker, sourceFile, isDefinedInLibraryFile)
+            ? getRenameInfoForNode(node, program.getTypeChecker(), sourceFile, declaration => program.isSourceFileDefaultLibrary(declaration.getSourceFile()))
             : undefined;
         return renameInfo || getRenameInfoError(Diagnostics.You_cannot_rename_this_element);
-
-        function isDefinedInLibraryFile(declaration: Node) {
-            if (!defaultLibFileName) {
-                return false;
-            }
-
-            const sourceFile = declaration.getSourceFile();
-            const canonicalName = getCanonicalFileName(normalizePath(sourceFile.fileName));
-            return canonicalName === getCanonicalDefaultLibName();
-        }
     }
 
     function getRenameInfoForNode(node: Node, typeChecker: TypeChecker, sourceFile: SourceFile, isDefinedInLibraryFile: (declaration: Node) => boolean): RenameInfo | undefined {
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -2202,8 +2202,7 @@ namespace ts {
 
         function getRenameInfo(fileName: string, position: number): RenameInfo {
             synchronizeHostData();
-            const defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
-            return Rename.getRenameInfo(program.getTypeChecker(), defaultLibFileName, getCanonicalFileName, getValidSourceFile(fileName), position);
+            return Rename.getRenameInfo(program, getValidSourceFile(fileName), position);
         }
 
         function getRefactorContext(file: SourceFile, positionOrRange: number | TextRange, preferences: UserPreferences, formatOptions?: FormatCodeSettings): RefactorContext {
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -11227,7 +11227,7 @@ declare namespace ts {
     function preProcessFile(sourceText: string, readImportFiles?: boolean, detectJavaScriptImports?: boolean): PreProcessedFileInfo;
 }
 declare namespace ts.Rename {
-    function getRenameInfo(typeChecker: TypeChecker, defaultLibFileName: string, getCanonicalFileName: GetCanonicalFileName, sourceFile: SourceFile, position: number): RenameInfo;
+    function getRenameInfo(program: Program, sourceFile: SourceFile, position: number): RenameInfo;
 }
 declare namespace ts.SignatureHelp {
     function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, cancellationToken: CancellationToken): SignatureHelpItems | undefined;

Original file line number	Diff line number	Diff line change
`@@ -2202,8 +2202,7 @@ namespace ts {`
`2202`	`2202`
`2203`	`2203`	`function getRenameInfo(fileName: string, position: number): RenameInfo {`
`2204`	`2204`	`synchronizeHostData();`
`2205`		`- const defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());`
`2206`		`- return Rename.getRenameInfo(program.getTypeChecker(), defaultLibFileName, getCanonicalFileName, getValidSourceFile(fileName), position);`
	`2205`	`+ return Rename.getRenameInfo(program, getValidSourceFile(fileName), position);`
`2207`	`2206`	`}`
`2208`	`2207`
`2209`	`2208`	`function getRefactorContext(file: SourceFile, positionOrRange: number \| TextRange, preferences: UserPreferences, formatOptions?: FormatCodeSettings): RefactorContext {`
Original file line number	Diff line number	Diff line change
`@@ -11227,7 +11227,7 @@ declare namespace ts {`
`11227`	`11227`	`function preProcessFile(sourceText: string, readImportFiles?: boolean, detectJavaScriptImports?: boolean): PreProcessedFileInfo;`
`11228`	`11228`	`}`
`11229`	`11229`	`declare namespace ts.Rename {`
`11230`		`- function getRenameInfo(typeChecker: TypeChecker, defaultLibFileName: string, getCanonicalFileName: GetCanonicalFileName, sourceFile: SourceFile, position: number): RenameInfo;`
	`11230`	`+ function getRenameInfo(program: Program, sourceFile: SourceFile, position: number): RenameInfo;`
`11231`	`11231`	`}`
`11232`	`11232`	`declare namespace ts.SignatureHelp {`
`11233`	`11233`	`function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, cancellationToken: CancellationToken): SignatureHelpItems \| undefined;`