Fix resolveCodeAction trying to edit files before creating them

This commit is contained in:
Lukas Wirth 2021-02-05 21:26:14 +01:00
parent 941f9157f5
commit fb2b1f5ea6

View File

@ -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);
};
}