Merge develop

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

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"))