Add 'fileToRename' property to RenameInfo

src/harness/fourslash.ts

@@ -1544,7 +1544,7 @@ Actual: ${stringify(fullActual)}`);
             }
         }
 
-        public verifyRenameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string) {
+        public verifyRenameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string, fileToRename?: string): void {
             const renameInfo = this.languageService.getRenameInfo(this.activeFile.fileName, this.currentCaretPosition);
             if (!renameInfo.canRename) {
                 this.raiseError("Rename did not succeed");
@@ -1554,6 +1554,7 @@ Actual: ${stringify(fullActual)}`);
             this.validate("fullDisplayName", fullDisplayName, renameInfo.fullDisplayName);
             this.validate("kind", kind, renameInfo.kind);
             this.validate("kindModifiers", kindModifiers, renameInfo.kindModifiers);
+            this.validate("fileToRename", fileToRename, renameInfo.fileToRename);
 
             if (this.getRanges().length !== 1) {
                 this.raiseError("Expected a single range to be selected in the test file.");
@@ -4404,8 +4405,8 @@ namespace FourSlashInterface {
             this.state.verifySemanticClassifications(classifications);
         }
 
-        public renameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string) {
-            this.state.verifyRenameInfoSucceeded(displayName, fullDisplayName, kind, kindModifiers);
+        public renameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string, fileToRename?: string) {
+            this.state.verifyRenameInfoSucceeded(displayName, fullDisplayName, kind, kindModifiers, fileToRename);
         }
 
         public renameInfoFailed(message?: string) {

src/server/client.ts

@@ -394,6 +394,7 @@ namespace ts.server {
 
             return this.lastRenameEntry = {
                 canRename: body.info.canRename,
+                fileToRename: body.info.fileToRename,
                 displayName: body.info.displayName,
                 fullDisplayName: body.info.fullDisplayName,
                 kind: body.info.kind,

src/server/protocol.ts

@@ -1063,6 +1063,12 @@ namespace ts.server.protocol {
          */
         canRename: boolean;
 
+        /**
+         * fileName to rename.
+         * If set, `getEditsForFileRename` should be called instead of `findRenameLocations`.
+         */
+        fileToRename?: string;
+
         /**
          * Error message if item can not be renamed.
          */

src/server/session.ts

@@ -878,7 +878,7 @@ namespace ts.server {
             return projectInfo;
         }
 
-        private getRenameInfo(args: protocol.FileLocationRequestArgs) {
+        private getRenameInfo(args: protocol.FileLocationRequestArgs): RenameInfo {
             const { file, project } = this.getFileAndProject(args);
             const position = this.getPositionInFile(args, file);
             return project.getLanguageService().getRenameInfo(file, position);

src/services/rename.ts

@@ -36,8 +36,9 @@ namespace ts.Rename {
             return undefined;
         }
 
-        // Can't rename a module name.
-        if (isStringLiteralLike(node) && tryGetImportFromModuleSpecifier(node)) return undefined;
+        if (isStringLiteralLike(node) && tryGetImportFromModuleSpecifier(node)) {
+            return getRenameInfoForModule(node, sourceFile, symbol);
+        }
 
         const kind = SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
         const specifierName = (isImportOrExportSpecifierName(node) || isStringOrNumericLiteral(node) && node.parent.kind === SyntaxKind.ComputedPropertyName)
@@ -48,9 +49,24 @@ namespace ts.Rename {
         return getRenameInfoSuccess(displayName, fullDisplayName, kind, SymbolDisplay.getSymbolModifiers(symbol), node, sourceFile);
     }
 
+    function getRenameInfoForModule(node: StringLiteralLike, sourceFile: SourceFile, moduleSymbol: Symbol): RenameInfo | undefined {
+        const moduleSourceFile = find(moduleSymbol.declarations, isSourceFile);
+        return moduleSourceFile && {
+            canRename: true,
+            fileToRename: moduleSourceFile.fileName,
+            kind: ScriptElementKind.moduleElement,
+            displayName: moduleSourceFile.fileName,
+            localizedErrorMessage: undefined,
+            fullDisplayName: moduleSourceFile.fileName,
+            kindModifiers: ScriptElementKindModifier.none,
+            triggerSpan: createTriggerSpanForNode(node, sourceFile),
+        };
+    }
+
     function getRenameInfoSuccess(displayName: string, fullDisplayName: string, kind: ScriptElementKind, kindModifiers: string, node: Node, sourceFile: SourceFile): RenameInfo {
         return {
             canRename: true,
+            fileToRename: undefined,
             kind,
             displayName,
             localizedErrorMessage: undefined,

src/services/types.ts

@@ -737,6 +737,11 @@ namespace ts {
 
     export interface RenameInfo {
         canRename: boolean;
+        /**
+         * fileName to rename.
+         * If set, `getEditsForFileRename` should be called instead of `findRenameLocations`.
+         */
+        fileToRename?: string;
         localizedErrorMessage?: string;
         displayName: string;
         fullDisplayName: string;

tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -4919,6 +4919,11 @@ declare namespace ts {
     }
     interface RenameInfo {
         canRename: boolean;
+        /**
+         * fileName to rename.
+         * If set, `getEditsForFileRename` should be called instead of `findRenameLocations`.
+         */
+        fileToRename?: string;
         localizedErrorMessage?: string;
         displayName: string;
         fullDisplayName: string;
@@ -6343,6 +6348,11 @@ declare namespace ts.server.protocol {
          * True if item can be renamed.
          */
         canRename: boolean;
+        /**
+         * fileName to rename.
+         * If set, `getEditsForFileRename` should be called instead of `findRenameLocations`.
+         */
+        fileToRename?: string;
         /**
          * Error message if item can not be renamed.
          */

tests/baselines/reference/api/typescript.d.ts

@@ -4919,6 +4919,11 @@ declare namespace ts {
     }
     interface RenameInfo {
         canRename: boolean;
+        /**
+         * fileName to rename.
+         * If set, `getEditsForFileRename` should be called instead of `findRenameLocations`.
+         */
+        fileToRename?: string;
         localizedErrorMessage?: string;
         displayName: string;
         fullDisplayName: string;

tests/cases/fourslash/fourslash.ts

@@ -310,7 +310,7 @@ declare namespace FourSlashInterface {
             text: string;
             textSpan?: TextSpan;
         }[]): void;
-        renameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string): void;
+        renameInfoSucceeded(displayName?: string, fullDisplayName?: string, kind?: string, kindModifiers?: string, fileToRename?: string): void;
         renameInfoFailed(message?: string): void;
         renameLocations(startRanges: ArrayOrSingle<Range>, options: Range[] | { findInStrings?: boolean, findInComments?: boolean, ranges: Range[] }): void;
 

tests/cases/fourslash/renameFile.ts

@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: /a.ts
+////export const a = 0;
+
+// @Filename: /b.ts
+////import { a } from "[|/**/./a|]";
+
+goTo.marker();
+verify.renameInfoSucceeded(/*displayName*/ "/a.ts", /*fullDisplayName*/ "/a.ts", /*kind*/ "module", /*kindModifiers*/ "", /*fileToRename*/ "/a.ts");