Merge #7576

7576: Fix resolveCodeAction trying to edit files before creating them r=Veykril a=Veykril

Fixes #7208
bors r+

Co-authored-by: Lukas Wirth <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
index c1c9f9754..cbda619ea 100644
--- a/editors/code/src/commands.ts
+++ b/editors/code/src/commands.ts
@@ -528,10 +528,10 @@ export function resolveCodeAction(ctx: Ctx): Cmd {
         const edit = client.protocol2CodeConverter.asWorkspaceEdit(itemEdit);
         // filter out all text edits and recreate the WorkspaceEdit without them so we can apply
         // snippet edits on our own
-        const itemEditWithoutTextEdits = { ...item, documentChanges: itemEdit.documentChanges?.filter(change => "kind" in change) };
-        const editWithoutTextEdits = client.protocol2CodeConverter.asWorkspaceEdit(itemEditWithoutTextEdits);
+        const lcFileSystemEdit = { ...itemEdit, documentChanges: itemEdit.documentChanges?.filter(change => "kind" in change) };
+        const fileSystemEdit = client.protocol2CodeConverter.asWorkspaceEdit(lcFileSystemEdit);
+        await vscode.workspace.applyEdit(fileSystemEdit);
         await applySnippetWorkspaceEdit(edit);
-        await vscode.workspace.applyEdit(editWithoutTextEdits);
     };
 }