Merge #2715

2715: Fixes to progress display r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 12 insertions, 17 deletions

diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 51dedd5ef..430ad31b4 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -11,17 +11,6 @@ let ctx!: Ctx;
 export async function activate(context: vscode.ExtensionContext) {
     ctx = new Ctx(context);
 
-    // Note: we try to start the server before we register various commands, so
-    // that it registers its `onDidChangeDocument` handler before us.
-    //
-    // This a horribly, horribly wrong way to deal with this problem.
-    try {
-        await ctx.restartServer();
-    } catch (e) {
-        vscode.window.showErrorMessage(e.message);
-    }
-
-
     // Commands which invokes manually via command pallet, shortcut, etc.
     ctx.registerCommand('analyzerStatus', commands.analyzerStatus);
     ctx.registerCommand('collectGarbage', commands.collectGarbage);
@@ -42,7 +31,17 @@ export async function activate(context: vscode.ExtensionContext) {
         ctx.overrideCommand('type', commands.onEnter);
     }
     activateStatusDisplay(ctx);
+
     activateHighlighting(ctx);
+    // Note: we try to start the server before we activate type hints so that it
+    // registers its `onDidChangeDocument` handler before us.
+    //
+    // This a horribly, horribly wrong way to deal with this problem.
+    try {
+        await ctx.restartServer();
+    } catch (e) {
+        vscode.window.showErrorMessage(e.message);
+    }
     activateInlayHints(ctx);
 }
 
diff --git a/editors/code/src/status_display.ts b/editors/code/src/status_display.ts
index 08cdc8bdf..371a2f3bb 100644
--- a/editors/code/src/status_display.ts
+++ b/editors/code/src/status_display.ts
@@ -36,13 +36,9 @@ class StatusDisplay implements vscode.Disposable {
             this.timer ||
             setInterval(() => {
                 if (this.packageName) {
-                    this.statusBarItem!.text = `cargo ${this.command} [${
-                        this.packageName
-                        }] ${this.frame()}`;
+                    this.statusBarItem!.text = `${this.frame()} cargo ${this.command} [${this.packageName}]`;
                 } else {
-                    this.statusBarItem!.text = `cargo ${
-                        this.command
-                        } ${this.frame()}`;
+                    this.statusBarItem!.text = `${this.frame()} cargo ${this.command}`;
                 }
             }, 300);