Remove generic prefix from status bar spinner

Author: Xanewok

src/extension.ts

@@ -106,7 +106,7 @@ function whenOpeningTextDocument(document: TextDocument) {
   folder = nearestParentWorkspace(folder, document.uri.fsPath);
 
   if (!folder) {
-    stopSpinner(`RLS: Cargo.toml missing`);
+    stopSpinner(`Cargo.toml missing`);
     return;
   }
 
@@ -172,7 +172,7 @@ class ClientWorkspace {
   }
 
   public async start() {
-    startSpinner('RLS', 'Starting');
+    startSpinner('Starting');
 
     const serverOptions: ServerOptions = async () => {
       await this.autoUpdate();
@@ -273,7 +273,7 @@ class ClientWorkspace {
 
     const runningProgress: Set<string> = new Set();
     await this.lc.onReady();
-    stopSpinner('RLS');
+    stopSpinner();
 
     this.lc.onNotification(
       new NotificationType<ProgressParams, void>('window/progress'),
@@ -292,9 +292,9 @@ class ClientWorkspace {
           } else if (progress.title) {
             status = `[${progress.title.toLowerCase()}]`;
           }
-          startSpinner('RLS', status);
+          startSpinner(status);
         } else {
-          stopSpinner('RLS');
+          stopSpinner();
         }
       },
     );

src/rustup.ts

@@ -21,7 +21,7 @@ export interface RustupConfig {
 }
 
 export async function rustupUpdate(config: RustupConfig) {
-  startSpinner('RLS', 'Updating…');
+  startSpinner('Updating…');
 
   try {
     const { stdout } = await withWsl(config.useWSL).exec(
@@ -103,7 +103,7 @@ async function hasToolchain(config: RustupConfig): Promise<boolean> {
 }
 
 async function tryToInstallToolchain(config: RustupConfig) {
-  startSpinner('RLS', 'Installing toolchain…');
+  startSpinner('Installing toolchain…');
   try {
     const { command, args } = withWsl(config.useWSL).modifyArgs(config.path, [
       'toolchain',
@@ -154,7 +154,7 @@ async function hasRlsComponents(config: RustupConfig): Promise<boolean> {
 }
 
 async function installRlsComponents(config: RustupConfig) {
-  startSpinner('RLS', 'Installing components…');
+  startSpinner('Installing components…');
 
   for (const component of REQUIRED_COMPONENTS) {
     try {

src/spinner.ts

@@ -1,9 +1,9 @@
 import { window } from 'vscode';
 
-export function startSpinner(prefix: string, postfix: string) {
-  window.setStatusBarMessage(`${prefix} $(settings-gear~spin) ${postfix}`);
+export function startSpinner(message: string) {
+  window.setStatusBarMessage(`RLS $(settings-gear~spin) ${message}`);
 }
 
-export function stopSpinner(message: string) {
-  window.setStatusBarMessage(message);
+export function stopSpinner(message?: string) {
+  window.setStatusBarMessage(`RLS ${message || ''}`);
 }