From 33b8677cb52eb54a3d4d8365fb3e6b7eba2c0dec Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Tue, 24 Jan 2017 14:32:39 -0800 Subject: [PATCH] Change "getIsDefinedInLibraryFile" back to just "isDefinedInLibraryFile" --- src/services/rename.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/services/rename.ts b/src/services/rename.ts index afb16618b03..2e9396888ef 100644 --- a/src/services/rename.ts +++ b/src/services/rename.ts @@ -1,23 +1,21 @@ /* @internal */ namespace ts.Rename { export function getRenameInfo(typeChecker: TypeChecker, defaultLibFileName: string, getCanonicalFileName: (fileName: string) => string, sourceFile: SourceFile, position: number): RenameInfo { + const getCanonicalDefaultLibName = memoize(() => getCanonicalFileName(ts.normalizePath(defaultLibFileName))); const node = getTouchingWord(sourceFile, position, /*includeJsDocComment*/ true); const renameInfo = node && nodeIsEligibleForRename(node) - ? getRenameInfoForNode(node, typeChecker, sourceFile, getIsDefinedInLibraryFile(defaultLibFileName, getCanonicalFileName)) + ? getRenameInfoForNode(node, typeChecker, sourceFile, isDefinedInLibraryFile) : undefined; return renameInfo || getRenameInfoError(Diagnostics.You_cannot_rename_this_element); - } - function getIsDefinedInLibraryFile(defaultLibFileName: string, getCanonicalFileName: (fileName: string) => string): (declaration: Node) => boolean { - if (!defaultLibFileName) { - return () => false; - } + function isDefinedInLibraryFile(declaration: Node) { + if (!defaultLibFileName) { + return false; + } - const canonicalDefaultLibName = getCanonicalFileName(ts.normalizePath(defaultLibFileName)); - return declaration => { const sourceFile = declaration.getSourceFile(); const canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName)); - return canonicalName === canonicalDefaultLibName; + return canonicalName === getCanonicalDefaultLibName(); } }