1 files changed, 37 insertions, 37 deletions

diff --git a/editors/code/src/commands/analyzer_status.ts b/editors/code/src/commands/analyzer_status.ts
index 2777ced24..cfe7d1af0 100644
--- a/editors/code/src/commands/analyzer_status.ts
+++ b/editors/code/src/commands/analyzer_status.ts
@@ -1,45 +1,20 @@
 import * as vscode from 'vscode';
-import { Server } from '../server';
 
-const statusUri = vscode.Uri.parse('rust-analyzer-status://status');
-
-export class TextDocumentContentProvider
-    implements vscode.TextDocumentContentProvider {
-    public eventEmitter = new vscode.EventEmitter<vscode.Uri>();
-    public syntaxTree: string = 'Not available';
-
-    public provideTextDocumentContent(
-        _uri: vscode.Uri,
-    ): vscode.ProviderResult<string> {
-        const editor = vscode.window.activeTextEditor;
-        if (editor == null) {
-            return '';
-        }
-        return Server.client.sendRequest<string>(
-            'rust-analyzer/analyzerStatus',
-            null,
-        );
-    }
-
-    get onDidChange(): vscode.Event<vscode.Uri> {
-        return this.eventEmitter.event;
-    }
-}
-
-let poller: NodeJS.Timer | null = null;
+import { Ctx, Cmd } from '../ctx';
 
 // Shows status of rust-analyzer (for debugging)
+export function analyzerStatus(ctx: Ctx): Cmd {
+    let poller: NodeJS.Timer | null = null;
+    const tdcp = new TextDocumentContentProvider(ctx);
 
-export function makeCommand(context: vscode.ExtensionContext) {
-    const textDocumentContentProvider = new TextDocumentContentProvider();
-    context.subscriptions.push(
+    ctx.pushCleanup(
         vscode.workspace.registerTextDocumentContentProvider(
             'rust-analyzer-status',
-            textDocumentContentProvider,
+            tdcp,
         ),
     );
 
-    context.subscriptions.push({
+    ctx.pushCleanup({
         dispose() {
             if (poller != null) {
                 clearInterval(poller);
@@ -49,12 +24,9 @@ export function makeCommand(context: vscode.ExtensionContext) {
 
     return async function handle() {
         if (poller == null) {
-            poller = setInterval(
-                () => textDocumentContentProvider.eventEmitter.fire(statusUri),
-                1000,
-            );
+            poller = setInterval(() => tdcp.eventEmitter.fire(tdcp.uri), 1000);
         }
-        const document = await vscode.workspace.openTextDocument(statusUri);
+        const document = await vscode.workspace.openTextDocument(tdcp.uri);
         return vscode.window.showTextDocument(
             document,
             vscode.ViewColumn.Two,
@@ -62,3 +34,31 @@ export function makeCommand(context: vscode.ExtensionContext) {
         );
     };
 }
+
+class TextDocumentContentProvider
+    implements vscode.TextDocumentContentProvider {
+    private ctx: Ctx;
+    uri = vscode.Uri.parse('rust-analyzer-status://status');
+    eventEmitter = new vscode.EventEmitter<vscode.Uri>();
+
+    constructor(ctx: Ctx) {
+        this.ctx = ctx;
+    }
+
+    provideTextDocumentContent(
+        _uri: vscode.Uri,
+    ): vscode.ProviderResult<string> {
+        const editor = vscode.window.activeTextEditor;
+        const client = this.ctx.client;
+        if (!editor || !client) return '';
+
+        return client.sendRequest<string>(
+            'rust-analyzer/analyzerStatus',
+            null,
+        );
+    }
+
+    get onDidChange(): vscode.Event<vscode.Uri> {
+        return this.eventEmitter.event;
+    }
+}