Skip to content

Add support for HLS versions >=0.2.2 #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Add support for HLS versions >=0.2.2 #74

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb84659
Add support for HLS versions >=0.2.2
shaunplee Jul 27, 2020
ec72400
Fix indentation.
shaunplee Jul 27, 2020
e531eeb
Use strings instead of symbols to identify formatters.
shaunplee Aug 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions lsp-haskell.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ For example, use the following the start the hie process in a nix-shell:
;; Internal variables

(defvar lsp-haskell--config-options (make-hash-table))
(defvar lsp-haskell--hls-configuration-id :languageServerHaskell)

;; ---------------------------------------------------------------------
;; HaRe functions
Expand Down Expand Up @@ -189,7 +190,24 @@ These are assembled from the customizable variables
;; ---------------------------------------------------------------------

(lsp-register-client
(make-lsp--client
(progn
(if (string-match
"haskell-language-server-wrapper" lsp-haskell-process-path-hie)
(let* ((hls-version-string
(shell-command-to-string
(combine-and-quote-strings
(list lsp-haskell-process-path-hie "--version"))))
(hls-version
(progn
(string-match
"haskell-language-server version\\: \\([\.[:digit:]]+\\)"
hls-version-string)
(match-string 1 hls-version-string))
))
(if (version< hls-version "0.2.2.0")
nil
(setq lsp-haskell--hls-configuration-id :haskell))))
(make-lsp--client
:new-connection (lsp-stdio-connection (lambda () (lsp-haskell--hie-command)))
:major-modes '(haskell-mode)
:server-id 'hie
Expand All @@ -198,19 +216,19 @@ These are assembled from the customizable variables
(lsp-haskell--set-configuration)))
;; :multi-root t
;; :initialization-options 'lsp-haskell--make-init-options
))
)))

(defun lsp-haskell--hie-command ()
(funcall lsp-haskell-process-wrapper-function (lsp--haskell-hie-command)))

(cl-defmethod lsp-initialization-options ((_server (eql hie)))
"Initialization options for haskell."
`(:languageServerHaskell ,lsp-haskell--config-options))
`(,lsp-haskell--hls-configuration-id ,lsp-haskell--config-options))

;; ---------------------------------------------------------------------

(defun lsp-haskell--set-configuration ()
(lsp--set-configuration `(:languageServerHaskell ,lsp-haskell--config-options)))
(lsp--set-configuration `(,lsp-haskell--hls-configuration-id ,lsp-haskell--config-options)))

(defun lsp-haskell-set-config (name option)
"Set config option NAME to value OPTION in the haskell lsp server."
Expand Down Expand Up @@ -299,19 +317,19 @@ These are assembled from the customizable variables
(defun lsp-haskell-set-formatter-brittany ()
"Use brittany."
(interactive)
(lsp-haskell-set-formatter :brittany)
(lsp-haskell-set-formatter "brittany")
(lsp-haskell--set-configuration))

(defun lsp-haskell-set-formatter-floskell ()
"Use floskell."
(interactive)
(lsp-haskell-set-formatter :floskell)
(lsp-haskell-set-formatter "floskell")
(lsp-haskell--set-configuration))

(defun lsp-haskell-set-formatter-ormolu ()
"Use ormolu."
(interactive)
(lsp-haskell-set-formatter :ormolu)
(lsp-haskell-set-formatter "ormolu")
(lsp-haskell--set-configuration))

;; ---------------------------------------------------------------------
Expand Down