bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'editors/code/src/commands.ts')
-rw-r--r--editors/code/src/commands.ts66
1 files changed, 62 insertions, 4 deletions
diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
index 3d33d255ad..849fae5cf2 100644
--- a/editors/code/src/commands.ts
+++ b/editors/code/src/commands.ts
@@ -4,7 +4,11 @@ import * as ra from "./lsp_ext";
import * as path from "path";
import type { Ctx, Cmd, CtxInit } from "./ctx";
-import { applySnippetWorkspaceEdit, applySnippetTextEdits } from "./snippets";
+import {
+ applySnippetWorkspaceEdit,
+ applySnippetTextEdits,
+ type SnippetTextDocumentEdit,
+} from "./snippets";
import { spawnSync } from "child_process";
import { type RunnableQuickPick, selectRunnable, createTask, createArgs } from "./run";
import { AstInspector } from "./ast_inspector";
@@ -1006,7 +1010,6 @@ export function resolveCodeAction(ctx: CtxInit): Cmd {
return;
}
const itemEdit = item.edit;
- const edit = await 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 lcFileSystemEdit = {
@@ -1017,16 +1020,71 @@ export function resolveCodeAction(ctx: CtxInit): Cmd {
lcFileSystemEdit,
);
await vscode.workspace.applyEdit(fileSystemEdit);
- await applySnippetWorkspaceEdit(edit);
+
+ // replace all text edits so that we can convert snippet text edits into `vscode.SnippetTextEdit`s
+ // FIXME: this is a workaround until vscode-languageclient supports doing the SnippeTextEdit conversion itself
+ // also need to carry the snippetTextDocumentEdits separately, since we can't retrieve them again using WorkspaceEdit.entries
+ const [workspaceTextEdit, snippetTextDocumentEdits] = asWorkspaceSnippetEdit(ctx, itemEdit);
+ await applySnippetWorkspaceEdit(workspaceTextEdit, snippetTextDocumentEdits);
if (item.command != null) {
await vscode.commands.executeCommand(item.command.command, item.command.arguments);
}
};
}
+function asWorkspaceSnippetEdit(
+ ctx: CtxInit,
+ item: lc.WorkspaceEdit,
+): [vscode.WorkspaceEdit, SnippetTextDocumentEdit[]] {
+ const client = ctx.client;
+
+ // partially borrowed from https://github.com/microsoft/vscode-languageserver-node/blob/295aaa393fda8ecce110c38880a00466b9320e63/client/src/common/protocolConverter.ts#L1060-L1101
+ const result = new vscode.WorkspaceEdit();
+
+ if (item.documentChanges) {
+ const snippetTextDocumentEdits: SnippetTextDocumentEdit[] = [];
+
+ for (const change of item.documentChanges) {
+ if (lc.TextDocumentEdit.is(change)) {
+ const uri = client.protocol2CodeConverter.asUri(change.textDocument.uri);
+ const snippetTextEdits: (vscode.TextEdit | vscode.SnippetTextEdit)[] = [];
+
+ for (const edit of change.edits) {
+ if (
+ "insertTextFormat" in edit &&
+ edit.insertTextFormat === lc.InsertTextFormat.Snippet
+ ) {
+ // is a snippet text edit
+ snippetTextEdits.push(
+ new vscode.SnippetTextEdit(
+ client.protocol2CodeConverter.asRange(edit.range),
+ new vscode.SnippetString(edit.newText),
+ ),
+ );
+ } else {
+ // always as a text document edit
+ snippetTextEdits.push(
+ vscode.TextEdit.replace(
+ client.protocol2CodeConverter.asRange(edit.range),
+ edit.newText,
+ ),
+ );
+ }
+ }
+
+ snippetTextDocumentEdits.push([uri, snippetTextEdits]);
+ }
+ }
+ return [result, snippetTextDocumentEdits];
+ } else {
+ // we don't handle WorkspaceEdit.changes since it's not relevant for code actions
+ return [result, []];
+ }
+}
+
export function applySnippetWorkspaceEditCommand(_ctx: CtxInit): Cmd {
return async (edit: vscode.WorkspaceEdit) => {
- await applySnippetWorkspaceEdit(edit);
+ await applySnippetWorkspaceEdit(edit, edit.entries());
};
}