Less "jumpy" spinner

Author: algesten

src/extension.ts

@@ -151,7 +151,7 @@ function startLanguageClient(context: ExtensionContext)
     }
     warnOnMissingCargoToml();
 
-    startSpinner('RLS starting');
+    startSpinner('RLS', 'Starting');
 
     warnOnRlsToml();
     // Check for deprecated env vars.
@@ -222,10 +222,11 @@ function progressCounter() {
                 runningProgress[progress.id] = true;
             }
             if (Object.keys(runningProgress).length) {
-                const msg =
+                const status =
                     typeof progress.percentage === 'number' ? asPercent(progress.percentage) :
-                        progress.message ? progress.message : '';
-                startSpinner(`RLS ${msg}`);
+                    progress.message ? progress.message :
+                    progress.title ? `[${progress.title.toLowerCase()}]` : '';
+                startSpinner('RLS', status);
             } else {
                 stopSpinner('RLS');
             }

src/rustup.ts

@@ -25,7 +25,7 @@ export function runRlsViaRustup(env: any): Promise<child_process.ChildProcess> {
 }
 
 export async function rustupUpdate() {
-    startSpinner('Updating RLS...');
+    startSpinner('RLS', 'Updating…');
 
     try {
         const { stdout } = await execChildProcess(CONFIGURATION.rustupPath + ' update');
@@ -74,7 +74,7 @@ async function hasToolchain(): Promise<boolean> {
 }
 
 async function tryToInstallToolchain(): Promise<void> {
-    startSpinner('Installing toolchain...');
+    startSpinner('RLS', 'Installing toolchain…');
     try {
         const { stdout, stderr } = await execChildProcess(CONFIGURATION.rustupPath + ' toolchain install ' + CONFIGURATION.channel);
         console.log(stdout);
@@ -129,7 +129,7 @@ async function hasRlsComponents(): Promise<boolean> {
 }
 
 async function installRls(): Promise<void> {
-    startSpinner('Installing RLS components');
+    startSpinner('RLS', 'Installing components');
 
     const tryFn: (component: string) => Promise<(Error | null)> = async (component: string) => {
         try {

src/spinner.ts

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