1 files changed, 28 insertions, 27 deletions

diff --git a/editors/code/src/commands/parent_module.ts b/editors/code/src/commands/parent_module.ts
index ad49e1bdb..bf40b4021 100644
--- a/editors/code/src/commands/parent_module.ts
+++ b/editors/code/src/commands/parent_module.ts
@@ -1,32 +1,33 @@
 import * as vscode from 'vscode';
-
 import * as lc from 'vscode-languageclient';
-import { Server } from '../server';
 
-export async function handle() {
-    const editor = vscode.window.activeTextEditor;
-    if (editor == null || editor.document.languageId !== 'rust') {
-        return;
-    }
-    const request: lc.TextDocumentPositionParams = {
-        textDocument: { uri: editor.document.uri.toString() },
-        position: Server.client.code2ProtocolConverter.asPosition(
-            editor.selection.active,
-        ),
-    };
-    const response = await Server.client.sendRequest<lc.Location[]>(
-        'rust-analyzer/parentModule',
-        request,
-    );
-    const loc = response[0];
-    if (loc == null) {
-        return;
-    }
-    const uri = Server.client.protocol2CodeConverter.asUri(loc.uri);
-    const range = Server.client.protocol2CodeConverter.asRange(loc.range);
+import { Ctx, Cmd } from '../ctx';
+
+export function parentModule(ctx: Ctx): Cmd {
+    return async () => {
+        const editor = ctx.activeRustEditor;
+        const client = ctx.client;
+        if (!editor || !client) return;
 
-    const doc = await vscode.workspace.openTextDocument(uri);
-    const e = await vscode.window.showTextDocument(doc);
-    e.selection = new vscode.Selection(range.start, range.start);
-    e.revealRange(range, vscode.TextEditorRevealType.InCenter);
+        const request: lc.TextDocumentPositionParams = {
+            textDocument: { uri: editor.document.uri.toString() },
+            position: client.code2ProtocolConverter.asPosition(
+                editor.selection.active,
+            ),
+        };
+        const response = await client.sendRequest<lc.Location[]>(
+            'rust-analyzer/parentModule',
+            request,
+        );
+        const loc = response[0];
+        if (loc == null) return;
+
+        const uri = client.protocol2CodeConverter.asUri(loc.uri);
+        const range = client.protocol2CodeConverter.asRange(loc.range);
+
+        const doc = await vscode.workspace.openTextDocument(uri);
+        const e = await vscode.window.showTextDocument(doc);
+        e.selection = new vscode.Selection(range.start, range.start);
+        e.revealRange(range, vscode.TextEditorRevealType.InCenter);
+    };
 }