Prepare test setup for text edits

new-packages/language-server/src/index.ts

@@ -44,18 +44,25 @@ connection.onInitialize((params) => {
                   return [];
                 }
 
+                const fileName = server.env.uriToFileName(textDocument.uri);
+
                 // TODO: a range is returned here regardless of the extraction status (extraction could error)
                 // DX has to account for this somehow or results with errors have to be ignored (this would be slower but it might be a good tradeoff)
                 return xstateProject
-                  .findMachines(server.env.uriToFileName(textDocument.uri))
-                  .map((range, index) => ({
-                    command: {
-                      title: 'Open Visual Editor',
-                      command: 'stately-xstate/edit-machine',
-                      arguments: [textDocument.uri, index],
-                    },
-                    range,
-                  }));
+                  .findMachines(fileName)
+                  .map((range, index) => {
+                    return {
+                      command: {
+                        title: 'Open Visual Editor',
+                        command: 'stately-xstate/edit-machine',
+                        arguments: [textDocument.uri, index],
+                      },
+                      range: xstateProject.getLinesAndCharactersRange(
+                        fileName,
+                        range,
+                      ),
+                    };
+                  });
               },
             };
           },
@@ -94,10 +101,13 @@ connection.onRequest(applyPatches, async ({ uri, machineIndex, patches }) => {
     patches,
   });
 
-  return edits.map(({ fileName, ...rest }) => ({
-    ...rest,
-    uri: server.env.fileNameToUri(fileName),
-  }));
+  return edits.map(({ fileName, range, ...rest }) => {
+    return {
+      ...rest,
+      uri: server.env.fileNameToUri(fileName),
+      range: xstateProject.getLinesAndCharactersRange(fileName, range),
+    };
+  });
 });
 
 connection.onInitialized(() => {

new-packages/language-server/src/protocol.ts

@@ -1,4 +1,8 @@
-import type { ExtractorDigraphDef, Patch } from '@xstate/ts-project';
+import type {
+  ExtractorDigraphDef,
+  LinesAndCharactersRange,
+  Patch,
+} from '@xstate/ts-project';
 import * as vscode from 'vscode-languageserver-protocol';
 
 type DistributiveOmit<T, K extends PropertyKey> = T extends unknown
@@ -7,9 +11,10 @@ type DistributiveOmit<T, K extends PropertyKey> = T extends unknown
 
 type TextEdit = DistributiveOmit<
   import('@xstate/ts-project').TextEdit,
-  'fileName'
+  'fileName' | 'range'
 > & {
   uri: string;
+  range: LinesAndCharactersRange;
 };
 
 export const getMachineAtIndex = new vscode.RequestType<

new-packages/ts-project/__tests__/actions.test.ts → new-packages/ts-project/__tests__/extraction/actions.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest';
-import { createTestProject, replaceUniqueIds, testdir, ts } from './utils';
+import { createTestProject, replaceUniqueIds, testdir, ts } from '../utils';
 
 test('should extract a string entry action (direct)', async () => {
   const tmpPath = await testdir({

new-packages/ts-project/__tests__/actors.test.ts → new-packages/ts-project/__tests__/extraction/actors.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest';
-import { createTestProject, replaceUniqueIds, testdir, ts } from './utils';
+import { createTestProject, replaceUniqueIds, testdir, ts } from '../utils';
 
 test('should extract an actor with string src (direct)', async () => {
   const tmpPath = await testdir({

new-packages/ts-project/__tests__/createMachine.test.ts → new-packages/ts-project/__tests__/extraction/createMachine.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest';
-import { createTestProject, replaceUniqueIds, testdir, ts } from './utils';
+import { createTestProject, replaceUniqueIds, testdir, ts } from '../utils';
 
 test('should extract a machine with empty config', async () => {
   const tmpPath = await testdir({

new-packages/ts-project/__tests__/guards.test.ts → new-packages/ts-project/__tests__/extraction/guards.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest';
-import { createTestProject, replaceUniqueIds, testdir, ts } from './utils';
+import { createTestProject, replaceUniqueIds, testdir, ts } from '../utils';
 
 test('should extract guard from transition (string)', async () => {
   const tmpPath = await testdir({

new-packages/ts-project/__tests__/state.test.ts → new-packages/ts-project/__tests__/extraction/state.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest';
-import { createTestProject, replaceUniqueIds, testdir, ts } from './utils';
+import { createTestProject, replaceUniqueIds, testdir, ts } from '../utils';
 
 test('should extract a simple state', async () => {
   const tmpPath = await testdir({

new-packages/ts-project/__tests__/transitions.test.ts → new-packages/ts-project/__tests__/extraction/transitions.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest';
-import { createTestProject, replaceUniqueIds, testdir, ts } from './utils';
+import { createTestProject, replaceUniqueIds, testdir, ts } from '../utils';
 
 test('should extract transition to a sibling (direct string)', async () => {
   const tmpPath = await testdir({

new-packages/ts-project/__tests__/source-edits/rename-state.test.ts

@@ -0,0 +1,48 @@
+import { expect, test } from 'vitest';
+import { createTestProject, testdir, ts } from '../utils';
+
+test('should rename an identifier state key to another identifier state key', async () => {
+  const tmpPath = await testdir({
+    'tsconfig.json': JSON.stringify({}),
+    'index.ts': ts`
+      import { createMachine } from "xstate";
+
+      createMachine({
+        type: "parallel",
+        states: {
+          foo: {},
+          bar: {},
+        },
+      });
+    `,
+  });
+
+  const project = await createTestProject(tmpPath);
+
+  const textEdits = project.editDigraph(
+    {
+      fileName: 'index.ts',
+      machineIndex: 0,
+    },
+    {
+      type: 'rename_state',
+      path: ['foo'],
+      name: 'NEW_NAME',
+    },
+  );
+  expect(await project.applyTextEdits(textEdits)).toMatchInlineSnapshot(
+    `
+    {
+      "index.ts": "import { createMachine } from "xstate";
+
+    createMachine({
+      type: "parallel",
+      states: {
+        "NEW_NAME": {},
+        bar: {},
+      },
+    });",
+    }
+  `,
+  );
+});