Ensure moved files don't result in broken imports

Author: dfreeman

packages/tsserver-plugin/__tests__/integration.test.ts

@@ -1288,6 +1288,117 @@ describe('tsserver plugin', () => {
     });
   });
 
+  describe('renaming files', () => {
+    test('moving a transformed file updates its imports', async () => {
+      await project.open({
+        'dir/greeting.ts': stripIndent`
+          import Component, { hbs } from '@glimmerx/component';
+
+          export interface GreetingArgs {
+            message: string;
+          }
+
+          export default class Greeting extends Component<GreetingArgs> {
+            static template = hbs\`{{@message}}, World!\`;
+          }
+        `,
+        'dir/index.ts': stripIndent`
+          import Component, { hbs } from '@glimmerx/component';
+          import Greeting from './greeting';
+
+          export class Application extends Component {
+            static template = hbs\`
+              <Greeting @message="Hello" />
+            \`;
+          }
+        `,
+      });
+
+      let greetingMoveResult = await server.request(CommandTypes.GetEditsForFileRename, {
+        oldFilePath: project.filePath('dir/greeting.ts'),
+        newFilePath: project.filePath('other/greeting.ts'),
+      });
+
+      expect(greetingMoveResult).toMatchObject([
+        {
+          fileName: project.filePath('dir/index.ts'),
+          textChanges: [
+            {
+              start: { line: 2, offset: 23 },
+              end: { line: 2, offset: 33 },
+              newText: '../other/greeting',
+            },
+          ],
+        },
+      ]);
+
+      let indexMoveResult = await server.request(CommandTypes.GetEditsForFileRename, {
+        oldFilePath: project.filePath('dir/index.ts'),
+        newFilePath: project.filePath('other/index.ts'),
+      });
+
+      expect(indexMoveResult).toMatchObject([
+        {
+          fileName: project.filePath('dir/index.ts'),
+          textChanges: [
+            {
+              start: { line: 2, offset: 23 },
+              end: { line: 2, offset: 33 },
+              newText: '../dir/greeting',
+            },
+          ],
+        },
+      ]);
+    });
+
+    test('moving an untransformed file updates its imports', async () => {
+      await project.open({
+        'dir/foo.ts': stripIndent`
+          export const message = 'hello';
+        `,
+        'dir/index.ts': stripIndent`
+          export { message } from './foo';
+        `,
+      });
+
+      let greetingMoveResult = await server.request(CommandTypes.GetEditsForFileRename, {
+        oldFilePath: project.filePath('dir/foo.ts'),
+        newFilePath: project.filePath('other/foo.ts'),
+      });
+
+      expect(greetingMoveResult).toMatchObject([
+        {
+          fileName: project.filePath('dir/index.ts'),
+          textChanges: [
+            {
+              start: { line: 1, offset: 26 },
+              end: { line: 1, offset: 31 },
+              newText: '../other/foo',
+            },
+          ],
+        },
+      ]);
+
+      let indexMoveResult = await server.request(CommandTypes.GetEditsForFileRename, {
+        oldFilePath: project.filePath('dir/index.ts'),
+        newFilePath: project.filePath('other/index.ts'),
+      });
+
+      expect(indexMoveResult).toMatchObject([
+        {
+          fileName: project.filePath('dir/index.ts'),
+          textChanges: [
+            {
+              start: { line: 1, offset: 26 },
+              end: { line: 1, offset: 31 },
+              newText: '../dir/foo',
+            },
+          ],
+        },
+      ]);
+    });
+  });
+
   describe('error recovery', () => {
     test('introducing and fixing a template error with editor changes', async () => {
       await project.open({

packages/tsserver-plugin/__tests__/test-server.ts

@@ -116,6 +116,7 @@ export class Project {
 
       if (!this.openFiles.has(file)) {
         if (!fs.existsSync(file)) {
+          fs.mkdirSync(path.dirname(file), { recursive: true });
           fs.writeFileSync(file, fileContent ?? '');
         }
 

packages/tsserver-plugin/src/index.ts

@@ -14,9 +14,10 @@ const init: ts.server.PluginModuleFactory = ({ typescript: ts }) => {
   return {
     create(info) {
       let logger = loggerFor(info);
-      let config = loadConfig(path.dirname(info.project.projectName));
+      let projectDir = path.dirname(info.project.projectName);
+      let config = loadConfig(projectDir);
 
-      logger.log('\nStarting @glint/tsserver-plugin at', new Date().toString());
+      logger.log('\nStarting @glint/tsserver-plugin in', projectDir, 'at', new Date().toString());
 
       modules.addProject(config, info.project);
 

packages/tsserver-plugin/src/language-service.ts

@@ -355,14 +355,7 @@ export default class GlintLanguageService implements Partial<ts.LanguageService>
     formatOptions: ts.FormatCodeSettings,
     preferences: ts.UserPreferences | undefined
   ): readonly ts.FileTextChanges[] {
-    let oldTransformedPath = isTransformablePath(oldFilePath)
-      ? getTransformedPath(oldFilePath)
-      : oldFilePath;
-
-    let edits = [
-      ...this.ls.getEditsForFileRename(oldTransformedPath, newFilePath, formatOptions, preferences),
-      ...this.ls.getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences),
-    ];
+    let edits = this.ls.getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences);
 
     return edits.filter((edit) => !isTransformedPath(edit.fileName));
   }