1 files changed, 24 insertions, 29 deletions

diff --git a/editors/code/src/commands/on_enter.ts b/editors/code/src/commands/on_enter.ts
index 772c64b3c..6f61883cd 100644
--- a/editors/code/src/commands/on_enter.ts
+++ b/editors/code/src/commands/on_enter.ts
@@ -1,33 +1,28 @@
-import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
-import { Server } from '../server';
-import {
-    handle as applySourceChange,
-    SourceChange,
-} from './apply_source_change';
 
-export async function handle(event: { text: string }): Promise<boolean> {
-    const editor = vscode.window.activeTextEditor;
-    if (
-        editor == null ||
-        editor.document.languageId !== 'rust' ||
-        event.text !== '\n'
-    ) {
-        return false;
-    }
-    const request: lc.TextDocumentPositionParams = {
-        textDocument: { uri: editor.document.uri.toString() },
-        position: Server.client.code2ProtocolConverter.asPosition(
-            editor.selection.active,
-        ),
+import { applySourceChange, SourceChange } from '../source_change';
+import { Cmd, Ctx } from '../ctx';
+
+export function onEnter(ctx: Ctx): Cmd {
+    return async (event: { text: string }) => {
+        const editor = ctx.activeRustEditor;
+        const client = ctx.client;
+        if (!editor || event.text !== '\n') return false;
+        if (!client) return false;
+
+        const request: lc.TextDocumentPositionParams = {
+            textDocument: { uri: editor.document.uri.toString() },
+            position: client.code2ProtocolConverter.asPosition(
+                editor.selection.active,
+            ),
+        };
+        const change = await client.sendRequest<undefined | SourceChange>(
+            'rust-analyzer/onEnter',
+            request,
+        );
+        if (!change) return false;
+
+        await applySourceChange(ctx, change);
+        return true;
     };
-    const change = await Server.client.sendRequest<undefined | SourceChange>(
-        'rust-analyzer/onEnter',
-        request,
-    );
-    if (!change) {
-        return false;
-    }
-    await applySourceChange(change);
-    return true;
 }