accept window/progress instead of beginBuild/diagnosticEnd

Author: algesten

src/extension.ts

@@ -127,7 +127,7 @@ function makeRlsProcess(): Promise<child_process.ChildProcess> {
     });
 
     return childProcessPromise.catch(() => {
-        window.setStatusBarMessage('RLS could not be started');
+        stopSpinner('RLS could not be started');
         return Promise.reject(undefined);
     });
 }
@@ -149,7 +149,7 @@ function startLanguageClient(context: ExtensionContext)
     }
     warnOnMissingCargoToml();
 
-    window.setStatusBarMessage('RLS: starting up');
+    startSpinner('RLS starting');
 
     warnOnRlsToml();
     // Check for deprecated env vars.
@@ -170,7 +170,7 @@ function startLanguageClient(context: ExtensionContext)
     // Create the language client and start the client.
     lc = new LanguageClient('Rust Language Server', serverOptions, clientOptions);
 
-    diagnosticCounter();
+    progressCounter();
 
     const disposable = lc.start();
     context.subscriptions.push(disposable);
@@ -205,17 +205,26 @@ async function autoUpdate() {
     }
 }
 
-function diagnosticCounter() {
-    let runningDiagnostics = 0;
+function progressCounter() {
+    const runningProgress: { [index: string]: boolean } = {};
+    const asPercent = (fraction: number): string => `${Math.round(fraction * 100)}%`;
     lc.onReady().then(() => {
-        lc.onNotification(new NotificationType('rustDocument/beginBuild'), function(_f: any) {
-            runningDiagnostics++;
-            startSpinner('RLS: working');
-        });
-        lc.onNotification(new NotificationType('rustDocument/diagnosticsEnd'), function(_f: any) {
-            runningDiagnostics--;
-            if (runningDiagnostics <= 0) {
-                stopSpinner('RLS: done');
+
+        stopSpinner('RLS');
+
+        lc.onNotification(new NotificationType('window/progress'), function (progress: any) {
+            if (progress.done) {
+                delete runningProgress[progress.id];
+            } else {
+                runningProgress[progress.id] = true;
+            }
+            if (Object.keys(runningProgress).length) {
+                const msg =
+                    typeof progress.percentage === 'number' ? asPercent(progress.percentage) :
+                        progress.message ? progress.message : '';
+                startSpinner(`RLS ${msg}`);
+            } else {
+                stopSpinner('RLS');
             }
         });
     });

src/spinner.ts

@@ -13,13 +13,14 @@
 import { window } from 'vscode';
 
 export function startSpinner(message: string) {
-    if (spinnerTimer == null) {
-        let state = 0;
-        spinnerTimer = setInterval(function() {
-            window.setStatusBarMessage(message + ' ' + spinner[state]);
-            state = (state + 1) % spinner.length;
-        }, 100);
+    if (spinnerTimer != null) {
+        clearInterval(spinnerTimer);
     }
+    let state = 0;
+    spinnerTimer = setInterval(function() {
+        window.setStatusBarMessage(message + ' ' + spinner[state]);
+        state = (state + 1) % spinner.length;
+    }, 100);
 }
 
 export function stopSpinner(message: string) {