Commit 8e105dfb authored by Frank Terbeck's avatar Frank Terbeck

Improve lsp-haskell support; keep it disabled for now

parent 878e3ff0
......@@ -1033,7 +1033,7 @@ It indents by four spaces and is otherwise similar to the BSD style.")
:after haskell-mode
:ensure t
:commands ghc-init
:hook (haskell-mode . ghc-init))
:config (add-hook 'haskell-mode-hook #'ghc-init))
(use-package gnuplot-mode
:ensure t
......@@ -1043,10 +1043,9 @@ It indents by four spaces and is otherwise similar to the BSD style.")
(use-package haskell-mode
:ensure t
:mode ("\\.l?hs\\'" . haskell-mode)
:init
(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
(add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
:config (use-package inf-haskell))
:config
(add-hook 'haskell-mode-hook #'haskell-indentation-mode)
(add-hook 'haskell-mode-hook #'haskell-doc-mode))
(use-package help-mode
:after ft-space-key
......@@ -1248,6 +1247,9 @@ buffer's working directory (which is available in the
(evil-declare-key 'motion Info-mode-map
(kbd "SPC") ft/private-evil-map))))
(use-package inf-haskell
:after haskell-mode)
(use-package ini-mode
:ensure t
:commands ini-mode
......@@ -1321,13 +1323,16 @@ buffer's working directory (which is available in the
(defvar ledger-use-iso-dates t))
(use-package lsp-haskell
:after lsp-mode haskell-mode
:disabled t
:ensure t
:hook (haskell-mode . lsp))
:after (haskell-mode lsp-mode)
:config (add-hook 'haskell-mode-hook #'lsp)
(defun lsp-haskell--make-init-options ()
"Init options for haskell."
`(:languageServerHaskell ,lsp-haskell--config-options)))
(use-package lsp-mode
:ensure t
:commands lsp lsp-mode)
:ensure t)
(use-package lsp-ui
:after lsp-mode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment