Add start and stop commands for rls, add auto start rls config value

Author: Yarn

package.json

@@ -94,6 +94,18 @@
                 "title": "Restart the RLS",
                 "description": "Sometimes, it's just best to try turning it off and on again",
                 "category": "Rust"
+            },
+            {
+                "command": "rls.start",
+                "title": "Start the RLS",
+                "description": "Start the RLS (when rust-client.autoStartRls is false or when manually stopped)",
+                "category": "Rust"
+            },
+            {
+                "command": "rls.stop",
+                "title": "Stop the RLS",
+                "description": "Stop the RLS for a workspace until manually started again",
+                "category": "Rust"
             }
         ],
         "taskDefinitions": [
@@ -187,6 +199,12 @@
                     "default": false,
                     "description": "Update the RLS whenever the extension starts up."
                 },
+                "rust-client.autoStartRls": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Start RLS automatically when opening a file or project.",
+                    "scope": "resource"
+                },
                 "rust-client.disableRustup": {
                     "type": "boolean",
                     "default": false,

src/configuration.ts

@@ -118,6 +118,13 @@ export class RLSConfiguration {
     return this.configuration.get<string>('rust-client.rlsPath');
   }
 
+  /**
+   * Whether RLS should be automaticallystarted when opening a relevant Rust project.
+   */
+  public get autoStartRls(): boolean {
+    return this.configuration.get<boolean>('rust-client.autoStartRls', true);
+  }
+
   // Added ignoreChannel for readChannel function. Otherwise we end in an infinite loop.
   public rustupConfig(ignoreChannel: boolean = false): RustupConfig {
     return {

src/extension.ts

@@ -160,7 +160,7 @@ function clientWorkspaceForUri(
   if (!existing && options && options.startIfMissing) {
     const workspace = new ClientWorkspace(folder);
     workspaces.set(folder.uri.toString(), workspace);
-    workspace.start();
+    workspace.auto_start();
   }
 
   return workspaces.get(folder.uri.toString());
@@ -188,6 +188,12 @@ class ClientWorkspace {
     this._progress = new Observable<{ message: string } | null>(null);
   }
 
+  public auto_start() {
+    if (this.config.autoStartRls) {
+      this.start();
+    }
+  }
+
   public async start() {
     this._progress.value = { message: 'Starting' };
 
@@ -265,6 +271,7 @@ class ClientWorkspace {
   public async stop() {
     if (this.lc) {
       await this.lc.stop();
+      this.lc = null;
     }
 
     this.disposables.forEach(d => d.dispose());
@@ -466,6 +473,14 @@ function registerCommands(): Disposable[] {
       'rls.run',
       (cmd: Execution) => activeWorkspace && activeWorkspace.runRlsCommand(cmd),
     ),
+    commands.registerCommand(
+      'rls.start',
+      () => activeWorkspace && activeWorkspace.start(),
+    ),
+    commands.registerCommand(
+      'rls.stop',
+      () => activeWorkspace && activeWorkspace.stop(),
+    ),
   ];
 }