Add 'renameFile' command to services

Andy Hanson · Andy Hanson · commit 505189f0fc30 · 2018-04-20T10:37:35.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -2212,6 +2212,15 @@ namespace ts {
         return absolutePath;
     }
 
+    export function getRelativePath(path: string, directoryPath: string, getCanonicalFileName: GetCanonicalFileName) {
+        const relativePath = getRelativePathToDirectoryOrUrl(directoryPath, path, directoryPath, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
+        return ensurePathIsRelative(relativePath);
+    }
+
+    export function ensurePathIsRelative(path: string): string {
+        return !pathIsRelative(path) ? "./" + path : path;
+    }
+
     export function getBaseFileName(path: string) {
         if (path === undefined) {
             return undefined;
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -444,6 +444,12 @@ namespace ts {
         }
     }
 
+    export function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined {
+        const containingDirectory = getDirectoryPath(containingFile);
+        const perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);
+        return perFolderCache && perFolderCache.get(moduleName);
+    }
+
     export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations {
         const traceEnabled = isTraceEnabled(compilerOptions, host);
         if (traceEnabled) {
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -622,9 +622,6 @@ namespace ts {
 
         Debug.assert(!!missingFilePaths);
 
-        // unconditionally set moduleResolutionCache to undefined to avoid unnecessary leaks
-        moduleResolutionCache = undefined;
-
         // Release any files we have acquired in the old program but are
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
@@ -670,7 +667,8 @@ namespace ts {
             sourceFileToPackageName,
             redirectTargetsSet,
             isEmittedFile,
-            getConfigFileParsingDiagnostics
+            getConfigFileParsingDiagnostics,
+            getResolvedModuleWithFailedLookupLocationsFromCache,
         };
 
         verifyCompilerOptions();
@@ -679,6 +677,10 @@ namespace ts {
 
         return program;
 
+        function getResolvedModuleWithFailedLookupLocationsFromCache(moduleName: string, containingFile: string): ResolvedModuleWithFailedLookupLocations {
+            return moduleResolutionCache && resolveModuleNameFromCache(moduleName, containingFile, moduleResolutionCache);
+        }
+
         function toPath(fileName: string): Path {
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2725,6 +2725,8 @@ namespace ts {
         /* @internal */ redirectTargetsSet: Map<true>;
         /** Is the file emitted file */
         /* @internal */ isEmittedFile(file: string): boolean;
+
+        /* @internal */ getResolvedModuleWithFailedLookupLocationsFromCache(moduleName: string, containingFile: string): ResolvedModuleWithFailedLookupLocations | undefined;
     }
 
     /* @internal */
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -3279,6 +3279,15 @@ Actual: ${stringify(fullActual)}`);
         private static textSpansEqual(a: ts.TextSpan, b: ts.TextSpan) {
             return a && b && a.start === b.start && a.length === b.length;
         }
+
+        public renameFile(options: FourSlashInterface.RenameFileOptions): void {
+            const changes = this.languageService.renameFile(options.oldPath, options.newPath, this.formatCodeSettings);
+            this.applyChanges(changes);
+            for (const fileName in options.newFileContents) {
+                this.openFile(fileName);
+                this.verifyCurrentFileContent(options.newFileContents[fileName]);
+            }
+        }
     }
 
     export function runFourSlashTest(basePath: string, testType: FourSlashTestType, fileName: string) {
@@ -4370,6 +4379,10 @@ namespace FourSlashInterface {
         public allRangesAppearInImplementationList(markerName: string) {
             this.state.verifyRangesInImplementationList(markerName);
         }
+
+        public renameFile(options: RenameFileOptions) {
+            this.state.renameFile(options);
+        }
     }
 
     export class Edit {
@@ -4710,4 +4723,10 @@ namespace FourSlashInterface {
         range?: FourSlash.Range;
         code: number;
     }
+
+    export interface RenameFileOptions {
+        readonly oldPath: string;
+        readonly newPath: string;
+        readonly newFileContents: { readonly [fileName: string]: string };
+    }
 }
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -528,6 +528,9 @@ namespace Harness.LanguageService {
         organizeImports(_scope: ts.OrganizeImportsScope, _formatOptions: ts.FormatCodeSettings): ReadonlyArray<ts.FileTextChanges> {
             throw new Error("Not supported on the shim.");
         }
+        renameFile(): ReadonlyArray<ts.FileTextChanges> {
+            throw new Error("Not supported on the shim.");
+        }
         getEmitOutput(fileName: string): ts.EmitOutput {
             return unwrapJSONCallResult(this.shim.getEmitOutput(fileName));
         }
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
@@ -70,6 +70,7 @@
         "../services/navigateTo.ts",
         "../services/navigationBar.ts",
         "../services/organizeImports.ts",
+        "../services/renameFile.ts",
         "../services/outliningElementsCollector.ts",
         "../services/patternMatcher.ts",
         "../services/preProcess.ts",
diff --git a/src/harness/unittests/session.ts b/src/harness/unittests/session.ts
@@ -263,6 +263,8 @@ namespace ts.server {
                 CommandNames.GetEditsForRefactorFull,
                 CommandNames.OrganizeImports,
                 CommandNames.OrganizeImportsFull,
+                CommandNames.RenameFile,
+                CommandNames.RenameFileFull,
             ];
 
             it("should not throw when commands are executed with invalid arguments", () => {
diff --git a/src/server/client.ts b/src/server/client.ts
@@ -632,6 +632,10 @@ namespace ts.server {
             return notImplemented();
         }
 
+        renameFile() {
+            return notImplemented();
+        }
+
         private convertCodeEditsToTextChanges(edits: protocol.FileCodeEdits[]): FileTextChanges[] {
             return edits.map(edit => {
                 const fileName = edit.fileName;
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
@@ -121,6 +121,9 @@ namespace ts.server.protocol {
         OrganizeImports = "organizeImports",
         /* @internal */
         OrganizeImportsFull = "organizeImports-full",
+        RenameFile = "renameFile",
+        /* @internal */
+        RenameFileFull = "renameFile-full",
 
         // NOTE: If updating this, be sure to also update `allCommandNames` in `harness/unittests/session.ts`.
     }
@@ -610,6 +613,22 @@ namespace ts.server.protocol {
         edits: ReadonlyArray<FileCodeEdits>;
     }
 
+    export interface RenameFileRequest extends Request {
+        command: CommandTypes.RenameFile;
+        arguments: RenameFileRequestArgs;
+    }
+
+    // Note: The file from FileRequestArgs is just any file in the project.
+    // We will generate code changes for every file in that project, so the choice is arbitrary.
+    export interface RenameFileRequestArgs extends FileRequestArgs {
+        readonly oldFilePath: string;
+        readonly newFilePath: string;
+    }
+
+    export interface RenameFileResponse extends Response {
+        edits: ReadonlyArray<FileCodeEdits>;
+    }
+
     /**
      * Request for the available codefixes at a specific position.
      */
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -1664,6 +1664,12 @@ namespace ts.server {
             }
         }
 
+        private renameFile(args: protocol.RenameFileRequestArgs, simplifiedResult: boolean): ReadonlyArray<protocol.FileCodeEdits> | ReadonlyArray<FileTextChanges> {
+            const { file, project } = this.getFileAndProject(args);
+            const changes = project.getLanguageService().renameFile(args.oldFilePath, args.newFilePath, this.getFormatOptions(file));
+            return simplifiedResult ? this.mapTextChangesToCodeEdits(project, changes) : changes;
+        }
+
         private getCodeFixes(args: protocol.CodeFixRequestArgs, simplifiedResult: boolean): ReadonlyArray<protocol.CodeFixAction> | ReadonlyArray<CodeFixAction> {
             if (args.errorCodes.length === 0) {
                 return undefined;
@@ -2117,7 +2123,13 @@ namespace ts.server {
             },
             [CommandNames.OrganizeImportsFull]: (request: protocol.OrganizeImportsRequest) => {
                 return this.requiredResponse(this.organizeImports(request.arguments, /*simplifiedResult*/ false));
-            }
+            },
+            [CommandNames.RenameFile]: (request: protocol.RenameFileRequest) => {
+                return this.requiredResponse(this.renameFile(request.arguments, /*simplifiedResult*/ true));
+            },
+            [CommandNames.RenameFileFull]: (request: protocol.RenameFileRequest) => {
+                return this.requiredResponse(this.renameFile(request.arguments, /*simplifiedResult*/ false));
+            },
         });
 
         public addProtocolHandler(command: string, handler: (request: protocol.Request) => HandlerResponse) {
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
@@ -66,6 +66,7 @@
         "../services/navigateTo.ts",
         "../services/navigationBar.ts",
         "../services/organizeImports.ts",
+        "../services/renameFile.ts",
         "../services/outliningElementsCollector.ts",
         "../services/patternMatcher.ts",
         "../services/preProcess.ts",
diff --git a/src/server/tsconfig.library.json b/src/server/tsconfig.library.json
@@ -72,6 +72,7 @@
         "../services/navigateTo.ts",
         "../services/navigationBar.ts",
         "../services/organizeImports.ts",
+        "../services/renameFile.ts",
         "../services/outliningElementsCollector.ts",
         "../services/patternMatcher.ts",
         "../services/preProcess.ts",
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -39,7 +39,6 @@ namespace ts.codefix {
     }
 
     function convertToImportCodeFixContext(context: CodeFixContext, symbolToken: Node, symbolName: string): ImportCodeFixContext {
-        const useCaseSensitiveFileNames = context.host.useCaseSensitiveFileNames ? context.host.useCaseSensitiveFileNames() : false;
         const { program } = context;
         const checker = program.getTypeChecker();
 
@@ -51,7 +50,7 @@ namespace ts.codefix {
             checker,
             compilerOptions: program.getCompilerOptions(),
             cachedImportDeclarations: [],
-            getCanonicalFileName: createGetCanonicalFileName(useCaseSensitiveFileNames),
+            getCanonicalFileName: createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(context.host)),
             symbolName,
             symbolToken,
             preferences: context.preferences,
@@ -547,11 +546,6 @@ namespace ts.codefix {
         return startsWith(path, "..");
     }
 
-    function getRelativePath(path: string, directoryPath: string, getCanonicalFileName: GetCanonicalFileName) {
-        const relativePath = getRelativePathToDirectoryOrUrl(directoryPath, path, directoryPath, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
-        return !pathIsRelative(relativePath) ? "./" + relativePath : relativePath;
-    }
-
     function getCodeActionsForAddImport(
         exportInfos: ReadonlyArray<SymbolExportInfo>,
         ctx: ImportCodeFixContext,
diff --git a/src/services/renameFile.ts b/src/services/renameFile.ts
@@ -0,0 +1,45 @@
+/* @internal */
+namespace ts {
+    export function renameFile(program: Program, oldFilePath: string, newFilePath: string, host: LanguageServiceHost, formatContext: formatting.FormatContext): ReadonlyArray<FileTextChanges> {
+        const pathUpdater = getPathUpdater(oldFilePath, newFilePath, host);
+        return textChanges.ChangeTracker.with({ host, formatContext }, changeTracker => {
+            const importsToUpdate = getImportsToUpdate(program, oldFilePath);
+            for (const importToUpdate of importsToUpdate) {
+                const newPath = pathUpdater(importToUpdate.text);
+                if (newPath !== undefined) {
+                    changeTracker.replaceNode(importToUpdate.getSourceFile(), importToUpdate, updateStringLiteralLike(importToUpdate, newPath));
+                }
+            }
+        });
+    }
+
+    function getImportsToUpdate(program: Program, oldFilePath: string): ReadonlyArray<StringLiteralLike> {
+        const checker = program.getTypeChecker();
+        const result: StringLiteralLike[] = [];
+        for (const file of program.getSourceFiles()) {
+            for (const importStringLiteral of file.imports) {
+                // If it resolved to something already, ignore.
+                if (checker.getSymbolAtLocation(importStringLiteral)) continue;
+
+                const resolved = program.getResolvedModuleWithFailedLookupLocationsFromCache(importStringLiteral.text, file.fileName);
+                if (contains(resolved.failedLookupLocations, oldFilePath)) {
+                    result.push(importStringLiteral);
+                }
+            }
+        }
+        return result;
+    }
+
+    function getPathUpdater(oldFilePath: string, newFilePath: string, host: LanguageServiceHost): (oldPath: string) => string | undefined {
+        // Get the relative path from old to new location, and append it on to the end of imports and normalize.
+        const rel = removeFileExtension(getRelativePath(newFilePath, getDirectoryPath(oldFilePath), createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host))));
+        return oldPath => {
+            if (!pathIsRelative(oldPath)) return;
+            return ensurePathIsRelative(normalizePath(combinePaths(getDirectoryPath(oldPath), rel)));
+        };
+    }
+
+    function updateStringLiteralLike(old: StringLiteralLike, newText: string): StringLiteralLike {
+        return old.kind === SyntaxKind.StringLiteral ? createLiteral(newText, /*isSingleQuote*/ old.singleQuote) : createNoSubstitutionTemplateLiteral(newText);
+    }
+}
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1128,7 +1128,6 @@ namespace ts {
         let lastProjectVersion: string;
         let lastTypesRootVersion = 0;
 
-        const useCaseSensitivefileNames = host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames();
         const cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
 
         const currentDirectory = host.getCurrentDirectory();
@@ -1145,7 +1144,8 @@ namespace ts {
             }
         }
 
-        const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames);
+        const useCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames(host);
+        const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
 
         function getValidSourceFile(fileName: string): SourceFile {
             const sourceFile = program.getSourceFile(fileName);
@@ -1202,7 +1202,7 @@ namespace ts {
                 getSourceFileByPath: getOrCreateSourceFileByPath,
                 getCancellationToken: () => cancellationToken,
                 getCanonicalFileName,
-                useCaseSensitiveFileNames: () => useCaseSensitivefileNames,
+                useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
                 getNewLine: () => getNewLineCharacter(newSettings, () => getNewLineOrDefaultFromHost(host)),
                 getDefaultLibFileName: (options) => host.getDefaultLibFileName(options),
                 writeFile: noop,
@@ -1950,6 +1950,10 @@ namespace ts {
             return OrganizeImports.organizeImports(sourceFile, formatContext, host, program, preferences);
         }
 
+        function renameFile(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings): ReadonlyArray<FileTextChanges> {
+            return ts.renameFile(getProgram(), oldFilePath, newFilePath, host, formatting.getFormatContext(formatOptions));
+        }
+
         function applyCodeActionCommand(action: CodeActionCommand): Promise<ApplyCodeActionCommandResult>;
         function applyCodeActionCommand(action: CodeActionCommand[]): Promise<ApplyCodeActionCommandResult[]>;
         function applyCodeActionCommand(action: CodeActionCommand | CodeActionCommand[]): Promise<ApplyCodeActionCommandResult | ApplyCodeActionCommandResult[]>;
@@ -2250,6 +2254,7 @@ namespace ts {
             getCombinedCodeFix,
             applyCodeActionCommand,
             organizeImports,
+            renameFile,
             getEmitOutput,
             getNonBoundSourceFile,
             getSourceFile,
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
@@ -63,6 +63,7 @@
         "navigateTo.ts",
         "navigationBar.ts",
         "organizeImports.ts",
+        "../services/renameFile.ts",
         "outliningElementsCollector.ts",
         "patternMatcher.ts",
         "preProcess.ts",
diff --git a/src/services/types.ts b/src/services/types.ts
@@ -334,6 +334,7 @@ namespace ts {
         getApplicableRefactors(fileName: string, positionOrRaneg: number | TextRange, preferences: UserPreferences | undefined): ApplicableRefactorInfo[];
         getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined): RefactorEditInfo | undefined;
         organizeImports(scope: OrganizeImportsScope, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): ReadonlyArray<FileTextChanges>;
+        renameFile(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings): ReadonlyArray<FileTextChanges>;
 
         getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean): EmitOutput;
 
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -1213,6 +1213,14 @@ namespace ts {
             ? isStringOrNumericLiteral(name.expression) ? name.expression.text : undefined
             : getTextOfIdentifierOrLiteral(name);
     }
+
+    export function hostUsesCaseSensitiveFileNames(host: LanguageServiceHost): boolean {
+        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    }
+
+    export function hostGetCanonicalFileName(host: LanguageServiceHost): GetCanonicalFileName {
+        return createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    }
 }
 
 // Display-part writer helpers
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
@@ -344,6 +344,11 @@ declare namespace FourSlashInterface {
         getSuggestionDiagnostics(expected: ReadonlyArray<Diagnostic>): void;
         ProjectInfo(expected: string[]): void;
         allRangesAppearInImplementationList(markerName: string): void;
+        renameFile(options: {
+            oldPath: string;
+            newPath: string;
+            newFileContents: { [fileName: string]: string };
+        });
     }
     class edit {
         backspace(count?: number): void;
diff --git a/tests/cases/fourslash/renameFile.ts b/tests/cases/fourslash/renameFile.ts

Original file line number	Diff line number	Diff line change
`@@ -444,6 +444,12 @@ namespace ts {`
`444`	`444`	`}`
`445`	`445`	`}`
`446`	`446`
	`447`	`+ export function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations \| undefined {`
	`448`	`+ const containingDirectory = getDirectoryPath(containingFile);`
	`449`	`+ const perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);`
	`450`	`+ return perFolderCache && perFolderCache.get(moduleName);`
	`451`	`+ }`
	`452`	`+`
`447`	`453`	`export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations {`
`448`	`454`	`const traceEnabled = isTraceEnabled(compilerOptions, host);`
`449`	`455`	`if (traceEnabled) {`
Original file line number	Diff line number	Diff line change
`@@ -2725,6 +2725,8 @@ namespace ts {`
`2725`	`2725`	`/* @internal */ redirectTargetsSet: Map<true>;`
`2726`	`2726`	`/** Is the file emitted file */`
`2727`	`2727`	`/* @internal */ isEmittedFile(file: string): boolean;`
	`2728`	`+`
	`2729`	`+ /* @internal */ getResolvedModuleWithFailedLookupLocationsFromCache(moduleName: string, containingFile: string): ResolvedModuleWithFailedLookupLocations \| undefined;`
`2728`	`2730`	`}`
`2729`	`2731`
`2730`	`2732`	`/* @internal */`
Original file line number	Diff line number	Diff line change
@@ -3279,6 +3279,15 @@ Actual: ${stringify(fullActual)}`);
`3279`	`3279`	`private static textSpansEqual(a: ts.TextSpan, b: ts.TextSpan) {`
`3280`	`3280`	`return a && b && a.start === b.start && a.length === b.length;`
`3281`	`3281`	`}`
	`3282`	`+`
	`3283`	`+ public renameFile(options: FourSlashInterface.RenameFileOptions): void {`
	`3284`	`+ const changes = this.languageService.renameFile(options.oldPath, options.newPath, this.formatCodeSettings);`
	`3285`	`+ this.applyChanges(changes);`
	`3286`	`+ for (const fileName in options.newFileContents) {`
	`3287`	`+ this.openFile(fileName);`
	`3288`	`+ this.verifyCurrentFileContent(options.newFileContents[fileName]);`
	`3289`	`+ }`
	`3290`	`+ }`
`3282`	`3291`	`}`
`3283`	`3292`
`3284`	`3293`	`export function runFourSlashTest(basePath: string, testType: FourSlashTestType, fileName: string) {`
`@@ -4370,6 +4379,10 @@ namespace FourSlashInterface {`
`4370`	`4379`	`public allRangesAppearInImplementationList(markerName: string) {`
`4371`	`4380`	`this.state.verifyRangesInImplementationList(markerName);`
`4372`	`4381`	`}`
	`4382`	`+`
	`4383`	`+ public renameFile(options: RenameFileOptions) {`
	`4384`	`+ this.state.renameFile(options);`
	`4385`	`+ }`
`4373`	`4386`	`}`
`4374`	`4387`
`4375`	`4388`	`export class Edit {`
`@@ -4710,4 +4723,10 @@ namespace FourSlashInterface {`
`4710`	`4723`	`range?: FourSlash.Range;`
`4711`	`4724`	`code: number;`
`4712`	`4725`	`}`
	`4726`	`+`
	`4727`	`+ export interface RenameFileOptions {`
	`4728`	`+ readonly oldPath: string;`
	`4729`	`+ readonly newPath: string;`
	`4730`	`+ readonly newFileContents: { readonly [fileName: string]: string };`
	`4731`	`+ }`
`4713`	`4732`	`}`
Original file line number	Diff line number	Diff line change
`@@ -528,6 +528,9 @@ namespace Harness.LanguageService {`
`528`	`528`	`organizeImports(_scope: ts.OrganizeImportsScope, _formatOptions: ts.FormatCodeSettings): ReadonlyArray<ts.FileTextChanges> {`
`529`	`529`	`throw new Error("Not supported on the shim.");`
`530`	`530`	`}`
	`531`	`+ renameFile(): ReadonlyArray<ts.FileTextChanges> {`
	`532`	`+ throw new Error("Not supported on the shim.");`
	`533`	`+ }`
`531`	`534`	`getEmitOutput(fileName: string): ts.EmitOutput {`
`532`	`535`	`return unwrapJSONCallResult(this.shim.getEmitOutput(fileName));`
`533`	`536`	`}`