Potential fix for crashes

.vscode/launch.json

@@ -13,18 +13,6 @@
 				"type": "npm",
 				"script": "watch"
 			}
-		},
-		{
-			"name": "Language Server E2E Test",
-			"type": "extensionHost",
-			"request": "launch",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}",
-				"--extensionTestsPath=${workspaceRoot}/client/out/test/index",
-				"${workspaceRoot}/client/testFixture"
-			],
-			"outFiles": ["${workspaceRoot}/client/out/test/**/*.js"]
 		}
 	]
 }

client/src/extension.ts

@@ -86,28 +86,24 @@ function start_lsp() {
 	client.start();
 }
 
-function stop_lsp() {
-	if (!client) {
-		return undefined;
-	}
-	return client.stop();
-}
-
 export function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(vscode.commands.registerCommand("sus.restartServer", async () => {
 		if (client) {
-			await client.stop();
-			client = undefined;
+			client.restart();
+		} else {
+			start_lsp();
 		}
-		start_lsp();
 	}));
 
 	start_lsp();
 }
 
 export function deactivate(): Thenable<void> | undefined {
-	if (!client) {
-		return undefined;
+	if (client) {
+		return client.stop().then(() => {
+			client.dispose().then(() => {
+				client = undefined;
+			});
+		});
 	}
-	return client.stop();
 }

package.json

@@ -5,7 +5,7 @@
 	"icon": "susLogo512.png",
 	"author": "Lennart Van Hirtum <[email protected]>",
 	"license": "MIT",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/pc2/sus-lsp"