Merge branch 'master' of https://github.com/alanz/vscode-hie-server into snippets

Author: lukel97

Changelog.md

@@ -1,3 +1,8 @@
+### 0.0.23
+
+* Fix multi-process issue, where vscode would launch multiple hie instances.
+  By @kfigiela
+
 ### 0.0.22
 
 * Add configuration option to enable liquid haskell processing. This

hie-vscode.sh

@@ -3,7 +3,7 @@
 export HIE_SERVER_PATH=`which hie`
 export HIE_WRAPPER_PATH=`which hie-wrapper`
 
-if [ "X" = "X$HIE_WRAPPER_PATH" ]; then
+if [ ! "X" = "X$HIE_WRAPPER_PATH" ]; then
 hie-wrapper --lsp $@
 elif [ "X" = "X$HIE_SERVER_PATH" ]; then
   echo "Content-Length: 100\r\n\r"

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-hie-server",
   "displayName": "Haskell Language Server",
   "description": "Language Server Protocol for Haskell via HIE",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "license": "MIT",
   "publisher": "alanz",
   "engines": {

src/extension.ts

@@ -210,6 +210,12 @@ function activateHieNoCheck(context: ExtensionContext, folder: WorkspaceFolder,
     hieCommandsRegistered = true;
   }
 
+  // If the client already has an LSP server, then don't start a new one.
+  // We check this again, as there may be multiple parallel requests.
+  if (clients.has(folder.uri.toString())) {
+    return;
+  }
+
   // Finally start the client and add it to the list of clients.
   langClient.start();
   clients.set(folder.uri.toString(), langClient);