[nongnu] elpa/haskell-tng-mode fe2b164 372/385: fix the build

[ELPA Syncer]

branch: elpa/haskell-tng-mode
commit fe2b16428c8ee37d8af885092f02052d7e66ebe9
Author: Tseen She <ts33n.sh3@gmail.com>
Commit: Tseen She <ts33n.sh3@gmail.com>

    fix the build
---
 Cask                               |  1 +
 haskell-tng-extra-lsp-hsinspect.el | 20 +++++++++++++-------
 haskell-tng-extra-stack.el         |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Cask b/Cask
index f42d10e..cb17b7f0 100644
--- a/Cask
+++ b/Cask
@@ -19,6 +19,7 @@
 ;;
 ;;; Code:
 
+(source gnu) ;; for spinner, dependency of lsp-mode
 (source melpa-stable)
 (source melpa) ;; for faceup
 
diff --git a/haskell-tng-extra-lsp-hsinspect.el 
b/haskell-tng-extra-lsp-hsinspect.el
index 78bbead..268b5e0 100644
--- a/haskell-tng-extra-lsp-hsinspect.el
+++ b/haskell-tng-extra-lsp-hsinspect.el
@@ -12,19 +12,25 @@
 ;;; Code:
 
 (require 'lsp-mode)
-(require 'subr-x)
 
-(defcustom haskell-tng-lsp-hsinspect '("hsinspect-lsp")
+(defcustom haskell-tng-lsp-hsinspect "hsinspect-lsp"
   "The command and args to launch the hsinspect language server."
   :group 'haskell-tng
-  :type 'listp)
+  :type 'stringp)
 
 (lsp-register-client
- (make-lsp-client :new-connection (lsp-stdio-connection
-                                   (lambda () (string-join 
haskell-tng-lsp-hsinspect " ")))
-                  :major-modes '(haskell-tng-mode)
-                  :server-id 'hsinspect-lsp))
+ (make-lsp-client
+  :new-connection (lsp-stdio-connection
+                   (lambda () haskell-tng-lsp-hsinspect))
+  :major-modes '(haskell-tng-mode)
+  :server-id 'hsinspect-lsp
+  ;; Do not use `:activation-fn' (with a check for .ghc.flags), the error
+  ;; message is not good.
+  ;;
+  ;; Do not use `:download-server-fn' because it is ignored.
+  ))
 
+;; needed by haskell-lsp's deserialisation
 (add-to-list
  'lsp-language-id-configuration
  '(haskell-tng-mode . "haskell"))
diff --git a/haskell-tng-extra-stack.el b/haskell-tng-extra-stack.el
index 50a4adb..2bd3fe9 100644
--- a/haskell-tng-extra-stack.el
+++ b/haskell-tng-extra-stack.el
@@ -19,7 +19,7 @@
  haskell-tng--hsinspect-which-hsinspect "stack build --silent hsinspect && 
stack exec --silent which -- hsinspect"
  haskell-tng--compile-history '("stack build --fast --no-interleaved-output 
--ghc-options=\"-j\" --no-run-tests"
                                 "stack build --fast --no-interleaved-output 
--ghc-options=\"-j\"")
- haskell-tng-lsp-hsinspect '("hsinspect-lsp" "--stack"))
+ haskell-tng-lsp-hsinspect "hsinspect-lsp --stack")
 
 (setq-default
  haskell-tng--compile-alt "stack clean"