emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge develop

Browse source
This commit is contained in:
Patrick Elliott 2018-07-18 08:36:29 +02:00
commit a0f800421e
6 changed files with 55 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/lang/haskell/+dante.el
View file

@ -1,6 +1,9 @@
;;; lang/haskell/+dante.el -*- lexical-binding: t; -*-
;;;###if (featurep! +dante)
(def-package! attrap
:commands (attrap-attrap))
(def-package! dante
:init
(setq dante-load-flags '(;; defaults:
@ -12,7 +15,7 @@
;; necessary to make company completion useful:
"-fdefer-typed-holes"
"-fdefer-type-errors"))
:hook (haskell-mode . dante-mode))
(def-package! attrap
:commands (attrap-attrap))
:hook (haskell-mode . dante-mode)
:config
(when (featurep! :feature syntax-checker)
(flycheck-add-next-checker 'haskell-dante '(warning . haskell-hlint))))

4
modules/lang/haskell/+intero.el
View file

@ -13,4 +13,6 @@ This is necessary because `intero-mode' doesn't do its own error checks."
(message "Couldn't find stack. Refusing to enable intero-mode."))))
(add-hook 'haskell-mode-hook #'+haskell|init-intero)
:config
(set-lookup-handlers! 'intero-mode :definition #'intero-goto-definition))
(set-lookup-handlers! 'intero-mode :definition #'intero-goto-definition)
(when (featurep! :feature syntax-checker)
(flycheck-add-next-checker 'intero '(warning . haskell-hlint))))

9
modules/lang/haskell/config.el
View file

@ -15,7 +15,6 @@
(set-lookup-handlers! 'haskell-mode :definition #'haskell-mode-jump-to-def-or-tag)
(set-file-template! 'haskell-mode :trigger #'haskell-auto-insert-module-template :project t)
(set-repl-handler! '(haskell-mode haskell-cabal-mode literate-haskell-mode) #'+haskell-repl-buffer)
(add-to-list 'completion-ignored-extensions ".hi")
(map! :map haskell-mode-map
:localleader
@ -35,11 +34,7 @@
:desc "info" :n "i" #'dante-info
:desc "load" :n "l" #'haskell-process-load-or-reload
:desc "eval command block >>>" :n "e" #'dante-eval-block
:desc "repair at point" :n "a" #'attrap-attrap)
:desc "repair at point" :n "a" #'attrap-attrap))
(when (featurep! :feature syntax-checker)
(after! flycheck
(dolist (checker (delq nil (list (if (featurep! +intero) 'intero)
(if (featurep! +dante) 'haskell-dante))))
(flycheck-add-next-checker checker '(warning . haskell-hlint))))))
(add-to-list 'completion-ignored-extensions ".hi"))