aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src/commands.ts
diff options
context:
space:
mode:
Diffstat (limited to 'editors/code/src/commands.ts')
-rw-r--r--editors/code/src/commands.ts10
1 files changed, 5 insertions, 5 deletions
diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
index 573af5aa5..e08030140 100644
--- a/editors/code/src/commands.ts
+++ b/editors/code/src/commands.ts
@@ -3,7 +3,7 @@ import * as lc from 'vscode-languageclient';
3import * as ra from './rust-analyzer-api'; 3import * as ra from './rust-analyzer-api';
4 4
5import { Ctx, Cmd } from './ctx'; 5import { Ctx, Cmd } from './ctx';
6import { applySnippetWorkspaceEdit } from './snippets'; 6import { applySnippetWorkspaceEdit, applySnippetTextEdits } from './snippets';
7import { spawnSync } from 'child_process'; 7import { spawnSync } from 'child_process';
8import { RunnableQuickPick, selectRunnable, createTask } from './run'; 8import { RunnableQuickPick, selectRunnable, createTask } from './run';
9import { AstInspector } from './ast_inspector'; 9import { AstInspector } from './ast_inspector';
@@ -102,7 +102,7 @@ export function onEnter(ctx: Ctx): Cmd {
102 102
103 if (!editor || !client) return false; 103 if (!editor || !client) return false;
104 104
105 const change = await client.sendRequest(ra.onEnter, { 105 const lcEdits = await client.sendRequest(ra.onEnter, {
106 textDocument: { uri: editor.document.uri.toString() }, 106 textDocument: { uri: editor.document.uri.toString() },
107 position: client.code2ProtocolConverter.asPosition( 107 position: client.code2ProtocolConverter.asPosition(
108 editor.selection.active, 108 editor.selection.active,
@@ -111,10 +111,10 @@ export function onEnter(ctx: Ctx): Cmd {
111 // client.logFailedRequest(OnEnterRequest.type, error); 111 // client.logFailedRequest(OnEnterRequest.type, error);
112 return null; 112 return null;
113 }); 113 });
114 if (!change) return false; 114 if (!lcEdits) return false;
115 115
116 const workspaceEdit = client.protocol2CodeConverter.asWorkspaceEdit(change); 116 const edits = client.protocol2CodeConverter.asTextEdits(lcEdits);
117 await applySnippetWorkspaceEdit(workspaceEdit); 117 await applySnippetTextEdits(editor, edits);
118 return true; 118 return true;
119 } 119 }
120 120