Add a command to shut down the server explicitly (#866)

Author: xamelllion

package.json

@@ -234,6 +234,11 @@
                 "category": "clangd",
                 "title": "Restart language server"
             },
+            {
+                "command": "clangd.shutdown",
+                "category": "clangd",
+                "title": "Shutdown language server"
+            },
             {
                 "command": "clangd.typeHierarchy",
                 "category": "clangd",

src/clangd-context.ts

@@ -242,6 +242,10 @@ export class ClangdContext implements vscode.Disposable {
     return this.client && this.client.state == vscodelc.State.Starting;
   }
 
+  clientIsRunning() {
+    return this.client && this.client.state == vscodelc.State.Running;
+  }
+
   dispose() {
     this.subscriptions.forEach((d) => { d.dispose(); });
     if (this.client)

src/extension.ts

@@ -19,10 +19,14 @@ export async function activate(context: vscode.ExtensionContext):
 
   let clangdContext: ClangdContext|null = null;
 
-  // An empty place holder for the activate command, otherwise we'll get an
-  // "command is not registered" error.
   context.subscriptions.push(
-      vscode.commands.registerCommand('clangd.activate', async () => {}));
+      vscode.commands.registerCommand('clangd.activate', async () => {
+        if (clangdContext && (clangdContext.clientIsStarting() ||
+                              clangdContext.clientIsRunning())) {
+          return;
+        }
+        vscode.commands.executeCommand('clangd.restart');
+      }));
   context.subscriptions.push(
       vscode.commands.registerCommand('clangd.restart', async () => {
         if (!get<boolean>('enable')) {
@@ -58,6 +62,14 @@ export async function activate(context: vscode.ExtensionContext):
           apiInstance.client = clangdContext?.client;
         }
       }));
+  context.subscriptions.push(
+      vscode.commands.registerCommand('clangd.shutdown', async () => {
+        if (clangdContext && clangdContext.clientIsStarting()) {
+          return;
+        }
+        if (clangdContext)
+          clangdContext.dispose();
+      }));
 
   let shouldCheck = false;
 

test/inactive-regions.test.ts

@@ -20,6 +20,8 @@ class MockClangdContext implements ClangdContext {
 
   clientIsStarting() { return false; }
 
+  clientIsRunning() { return true; }
+
   dispose() { throw new Error('Method not implemented.'); }
 }