1 files changed, 22 insertions, 24 deletions

diff --git a/editors/code/src/commands/join_lines.ts b/editors/code/src/commands/join_lines.ts
index 134ddc801..7b08c3255 100644
--- a/editors/code/src/commands/join_lines.ts
+++ b/editors/code/src/commands/join_lines.ts
@@ -1,29 +1,27 @@
-import * as vscode from 'vscode';
+import * as lc from 'vscode-languageclient';
 
-import { Range, TextDocumentIdentifier } from 'vscode-languageclient';
-import { Server } from '../server';
-import {
-    handle as applySourceChange,
-    SourceChange,
-} from './apply_source_change';
+import { Ctx, Cmd } from '../ctx';
+import { applySourceChange, SourceChange } from '../source_change';
 
-interface JoinLinesParams {
-    textDocument: TextDocumentIdentifier;
-    range: Range;
-}
+export function joinLines(ctx: Ctx): Cmd {
+    return async () => {
+        const editor = ctx.activeRustEditor;
+        const client = ctx.client;
+        if (!editor || !client) return;
 
-export async function handle() {
-    const editor = vscode.window.activeTextEditor;
-    if (editor == null || editor.document.languageId !== 'rust') {
-        return;
-    }
-    const request: JoinLinesParams = {
-        range: Server.client.code2ProtocolConverter.asRange(editor.selection),
-        textDocument: { uri: editor.document.uri.toString() },
+        const request: JoinLinesParams = {
+            range: client.code2ProtocolConverter.asRange(editor.selection),
+            textDocument: { uri: editor.document.uri.toString() },
+        };
+        const change = await client.sendRequest<SourceChange>(
+            'rust-analyzer/joinLines',
+            request,
+        );
+        await applySourceChange(ctx, change);
     };
-    const change = await Server.client.sendRequest<SourceChange>(
-        'rust-analyzer/joinLines',
-        request,
-    );
-    await applySourceChange(change);
+}
+
+interface JoinLinesParams {
+    textDocument: lc.TextDocumentIdentifier;
+    range: lc.Range;
 }