When renaming module, ensure rename span is just the last component of the path

Author: Andy Hanson

src/services/rename.ts

@@ -44,6 +44,9 @@ namespace ts.Rename {
         const withoutIndex = node.text.endsWith("/index") || node.text.endsWith("/index.js") ? undefined : tryRemoveSuffix(removeFileExtension(moduleSourceFile.fileName), "/index");
         const name = withoutIndex === undefined ? moduleSourceFile.fileName : withoutIndex;
         const kind = withoutIndex === undefined ? ScriptElementKind.moduleElement : ScriptElementKind.directory;
+        const indexAfterLastSlash = node.text.lastIndexOf("/") + 1; // If no slash, this is 0.
+        // + 1 to account for the quote character.
+        const triggerSpan = createTextSpan(node.getStart(sourceFile) + 1 + indexAfterLastSlash, node.text.length - indexAfterLastSlash);
         return {
             canRename: true,
             fileToRename: name,
@@ -52,7 +55,7 @@ namespace ts.Rename {
             localizedErrorMessage: undefined,
             fullDisplayName: name,
             kindModifiers: ScriptElementKindModifier.none,
-            triggerSpan: createTriggerSpanForNode(node, sourceFile),
+            triggerSpan,
         };
     }
 

tests/cases/fourslash/findAllRefs_importType_exportEquals.ts

@@ -8,12 +8,12 @@
 ////export = [|T|];
 
 // @Filename: /b.ts
-////const x: import("[|./a|]") = 0;
-////const y: import("[|./a|]").U = "";
+////const x: import("[|./[|a|]|]") = 0;
+////const y: import("[|./[|a|]|]").U = "";
 
 verify.noErrors();
 
-const [r0, r1, r2, r3, r4] = test.ranges();
+const [r0, r1, r2, r3, r3b, r4, r4b] = test.ranges();
 verify.referenceGroups(r0, [{ definition: "type T = number\nnamespace T", ranges: [r0, r2, r3] }]);
 verify.referenceGroups(r1, [{ definition: "namespace T", ranges: [r1, r2] }]);
 verify.referenceGroups(r2, [{ definition: "type T = number\nnamespace T", ranges: [r0, r1, r2, r3] }]);
@@ -25,7 +25,7 @@ verify.referenceGroups([r3, r4], [
 verify.renameLocations(r0, [r0, r2]);
 verify.renameLocations(r1, [r1, r2]);
 verify.renameLocations(r2, [r0, r1, r2]);
-for (const range of [r3, r4]) {
+for (const range of [r3b, r4b]) {
     goTo.rangeStart(range);
     verify.renameInfoSucceeded(/*displayName*/ "/a.ts", /*fullDisplayName*/ "/a.ts", /*kind*/ "module", /*kindModifiers*/ "", /*fileToRename*/ "/a.ts", range);
 }

tests/cases/fourslash/renameImport.ts

@@ -9,13 +9,13 @@
 ////export const x = 0;
 
 // @Filename: /b.ts
-////import * as a from "[|./a|]";
-////import a2 = require("[|./a|]");
-////import * as dir from "[|{| "target": "dir" |}./dir|]";
-////import * as dir2 from "[|{| "target": "dir/index" |}./dir/index|]";
+////import * as a from "./[|a|]";
+////import a2 = require("./[|a|]");
+////import * as dir from "./[|{| "target": "dir" |}dir|]";
+////import * as dir2 from "./dir/[|{| "target": "dir/index" |}index|]";
 
 // @Filename: /c.js
-////const a = require("[|./a|]");
+////const a = require("./[|a|]");
 
 verify.noErrors();
 goTo.eachRange(range => {