[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/haskell-tng-mode fe2b164 372/385: fix the build
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/haskell-tng-mode fe2b164 372/385: fix the build |
Date: |
Wed, 6 Oct 2021 00:00:06 -0400 (EDT) |
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"
- [nongnu] elpa/haskell-tng-mode 70e649b 330/385: import qualified is even smarter, (continued)
- [nongnu] elpa/haskell-tng-mode 70e649b 330/385: import qualified is even smarter, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 5a064fd 328/385: hypen prefix asks to qualify the import, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode c42b5c5 338/385: use url-copy-path instead of shelling out, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 8405852 351/385: document bugs and ideas, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode f429326 327/385: thots, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 8bb3c34 363/385: the in-memory cache doesn't have to cache nil, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode f5977b6 339/385: bugfix for source downloading, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 9359c7b 349/385: cl-loop, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode f5d76fc 348/385: tidy docs, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 3b37524 360/385: bugfix for qualified imports when the cache was bad, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode fe2b164 372/385: fix the build,
ELPA Syncer <=
- [nongnu] elpa/haskell-tng-mode 63225d5 374/385: use .ghc.path to find hsinspect, build tool agnostic, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 3d1122b 116/385: notes on regexps, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode c3793b2 176/385: canonical until macro, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode b7cb5b9 214/385: starting to create imenu, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 5306ae2 217/385: fix type faces with constraints, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 5f81d6b 219/385: bump python version, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 8f4d7fc 225/385: advice around smartparens workaround, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 4cbf702 205/385: move third party deps to -contrib, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode 3ff278e 227/385: ability to not continue comments, ELPA Syncer, 2021/10/06
- [nongnu] elpa/haskell-tng-mode dbcef71 235/385: workaround the env file situation, ELPA Syncer, 2021/10/06