5 files changed, 33 insertions, 36 deletions

diff --git a/editors/code/.vscodeignore b/editors/code/.vscodeignore
index f2c4d3307..9bcd28e61 100644
--- a/editors/code/.vscodeignore
+++ b/editors/code/.vscodeignore
@@ -1,4 +1,4 @@
 **
-!out/extension.js
+!out/main.js
 !package.json
 !package-lock.json
diff --git a/editors/code/package.json b/editors/code/package.json
index 8c480cc3f..d14a36f8c 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -43,7 +43,7 @@
         "onCommand:rust-analyzer.collectGarbage",
         "workspaceContains:**/Cargo.toml"
     ],
-    "main": "./out/extension",
+    "main": "./out/main",
     "contributes": {
         "taskDefinitions": [
             {
diff --git a/editors/code/rollup.config.js b/editors/code/rollup.config.js
index e4b21afbd..4c001f899 100644
--- a/editors/code/rollup.config.js
+++ b/editors/code/rollup.config.js
@@ -4,7 +4,7 @@ import commonjs from '@rollup/plugin-commonjs';
 import nodeBuiltins from 'builtin-modules';
 
 export default {
-    input: 'src/extension.ts',
+    input: 'src/main.ts',
     plugins: [
         typescript(),
         resolve({
@@ -19,7 +19,7 @@ export default {
     ],
     external: [...nodeBuiltins, 'vscode'],
     output: {
-        file: './out/extension.js',
+        file: './out/main.js',
         format: 'cjs'
     }
 };
diff --git a/editors/code/src/commands/analyzer_status.ts b/editors/code/src/commands/analyzer_status.ts
index 2777ced24..5840e8fc0 100644
--- a/editors/code/src/commands/analyzer_status.ts
+++ b/editors/code/src/commands/analyzer_status.ts
@@ -1,41 +1,15 @@
 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;
-
 // Shows status of rust-analyzer (for debugging)
 
 export function makeCommand(context: vscode.ExtensionContext) {
-    const textDocumentContentProvider = new TextDocumentContentProvider();
+    let poller: NodeJS.Timer | null = null;
+    const tdcp = new TextDocumentContentProvider();
+
     context.subscriptions.push(
         vscode.workspace.registerTextDocumentContentProvider(
             'rust-analyzer-status',
-            textDocumentContentProvider,
+            tdcp,
         ),
     );
 
@@ -50,11 +24,11 @@ export function makeCommand(context: vscode.ExtensionContext) {
     return async function handle() {
         if (poller == null) {
             poller = setInterval(
-                () => textDocumentContentProvider.eventEmitter.fire(statusUri),
+                () => 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 +36,26 @@ export function makeCommand(context: vscode.ExtensionContext) {
         );
     };
 }
+
+class TextDocumentContentProvider
+    implements vscode.TextDocumentContentProvider {
+    uri = vscode.Uri.parse('rust-analyzer-status://status');
+    eventEmitter = new vscode.EventEmitter<vscode.Uri>();
+
+    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;
+    }
+}
diff --git a/editors/code/src/extension.ts b/editors/code/src/main.ts
index 1da10ebd0..1da10ebd0 100644
--- a/editors/code/src/extension.ts
+++ b/editors/code/src/main.ts