Simplified haskell-init.el.
authorLuke Hoersten <luke@hoersten.org>
Wed, 16 Sep 2015 19:27:21 -0500
changeset 81 4da7819d1a1c
parent 80 e848f1863d6b
child 82 12cf67bc486c
Simplified haskell-init.el.
elisp/haskell-init.el
elisp/stack-mode/stack-mode.el
--- a/elisp/haskell-init.el	Wed Sep 16 16:53:07 2015 -0500
+++ b/elisp/haskell-init.el	Wed Sep 16 19:27:21 2015 -0500
@@ -3,7 +3,7 @@
 
 ;; Require packages
 (require 'package-require)
-(package-require '(haskell-mode yasnippet haskell-snippets flycheck flycheck-haskell shm))
+(package-require '(haskell-mode yasnippet haskell-snippets flycheck shm))
 
 (add-to-list 'load-path "~/.emacs.d/elisp/stack-mode")
 
@@ -41,8 +41,6 @@
  (lambda ()
    ;; (imenu-add-menubar-index)
    (flycheck-mode)
-   (flycheck-haskell-setup)
-   (flycheck-disable-checker 'haskell-ghc)
    ;; (haskell-indentation-mode t)
    (stack-mode)
    (subword-mode)
@@ -54,14 +52,9 @@
 (custom-set-variables
  '(capitalized-words-mode t)
  '(haskell-stylish-on-save t)
-
  '(haskell-indentation-layout-offset 4)
  '(haskell-indentation-left-offset 4)
 
- '(haskell-interactive-mode-eval-pretty t)
- '(haskell-interactive-mode-scroll-to-bottom t)
- '(haskell-interactive-mode-eval-mode 'haskell-mode)
-
  '(haskell-notify-p t)
  '(haskell-align-imports-pad-after-name t)
  '(haskell-ask-also-kill-buffers nil)
@@ -69,60 +62,27 @@
 
  '(shm-use-presentation-mode t)
  '(shm-auto-insert-skeletons t)
- '(shm-auto-insert-bangs t))
-
+ '(shm-auto-insert-bangs t)
 
-;;  ;; '(haskell-process-type 'cabal-repl)
-;;  ;; ;; '(haskell-process-args-cabal-repl '("--ghc-option=-ferror-spans" "--with-ghc=ghci-ng")) ;; ghci-ng
-;;  ;; ;; '(haskell-process-path-ghci "ghci-ng") ;; ghci-ng
-;;  ;; '(haskell-process-args-ghci "-ferror-spans")
-;;  ;; '(haskell-process-suggest-remove-import-lines t)
-;;  ;; '(haskell-process-auto-import-loaded-modules t)
-;;  ;; '(haskell-process-log t)
-;;  ;; '(haskell-process-reload-with-fbytecode nil)
-;;  ;; '(haskell-process-use-presentation-mode t)
-;;  ;; '(haskell-process-suggest-haskell-docs-imports t)
-;;  ;; '(haskell-process-suggest-hoogle-imports t)
-;;  ;; '(haskell-process-generate-tags nil)
-;;  ;; '(haskell-process-show-debug-tips nil)
-
-
+ '(haskell-interactive-mode-eval-pretty t)
+ '(haskell-interactive-mode-scroll-to-bottom t)
+ '(haskell-interactive-mode-eval-mode 'haskell-mode)
+ '(haskell-interactive-popup-errors nil)
+ '(haskell-process-type 'stack-ghci)
+ '(haskell-process-auto-import-loaded-modules t)
+ '(haskell-process-log t))
 
-;; ;; haskell-interactive-mode keybindings
-;; (define-key interactive-haskell-mode-map (kbd "C-c C-l") 'haskell-process-load-or-reload)
-;; (define-key interactive-haskell-mode-map (kbd "M-,") 'haskell-who-calls)
-;; (define-key interactive-haskell-mode-map (kbd "M-.") 'haskell-mode-goto-loc)
-;; (define-key interactive-haskell-mode-map (kbd "C-?") 'haskell-mode-find-uses)
-;; (define-key interactive-haskell-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build)
-;; (define-key interactive-haskell-mode-map (kbd "C-c C-t") 'haskell-mode-show-type-at)
-;; (define-key interactive-haskell-mode-map (kbd "C-`") 'haskell-interactive-bring)
-;; (define-key interactive-haskell-mode-map (kbd "C-c C-k") 'haskell-process-clear)
-;; (define-key interactive-haskell-mode-map (kbd "C-c c") 'haskell-process-cabal)
-
-;; (define-key haskell-interactive-mode-map (kbd "C-c C-i") 'haskell-process-do-info)
-;; (define-key haskell-interactive-mode-map (kbd "C-<left>") 'haskell-interactive-mode-error-backward)
-;; (define-key haskell-interactive-mode-map (kbd "C-<right>") 'haskell-interactive-mode-error-forward)
-;; (define-key haskell-interactive-mode-map (kbd "C-c c") 'haskell-process-cabal)
+;; keys
+(define-key haskell-mode-map (kbd "M-,") 'haskell-who-calls)
+(define-key haskell-mode-map (kbd "C-c i") 'haskell-navigate-imports)
+(define-key haskell-mode-map (kbd "C-c C-d") 'haskell-describe)
+(define-key haskell-mode-map (kbd "C-c C-c") 'haskell-process-load-or-reload)
+(define-key haskell-mode-map (kbd "C-`") 'haskell-interactive-bring)
+(define-key haskell-cabal-mode-map (kbd "C-`") 'haskell-interactive-bring)
+(define-key haskell-interactive-mode-map (kbd "C-c C-i") 'haskell-process-do-info)
+(define-key haskell-interactive-mode-map (kbd "C-c C-t") 'haskell-process-do-type)
 
-;; ;; haskell-mode
-;; (define-key haskell-mode-map (kbd "C-c C-l") 'haskell-process-load-or-reload)
-;; (define-key haskell-mode-map (kbd "C-`") 'haskell-interactive-bring)
-;; (define-key haskell-mode-map (kbd "C-c C-t") 'haskell-process-do-type)
-;; (define-key haskell-mode-map (kbd "C-c i") 'haskell-navigate-imports)
-;; (define-key haskell-mode-map (kbd "C-c C-i") 'haskell-process-do-info)
-;; (define-key haskell-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build)
-;; (define-key haskell-mode-map (kbd "C-c C-d") 'haskell-describe)
-;; (define-key haskell-mode-map (kbd "C-c C-k") 'haskell-process-clear)
-;; (define-key haskell-mode-map (kbd "C-c c") 'haskell-process-cabal)
-;; (define-key haskell-mode-map (kbd "SPC") 'haskell-mode-contextual-space)
-
-;; ;; cabal
-;; (define-key haskell-cabal-mode-map (kbd "C-`") 'haskell-interactive-bring)
-;; (define-key haskell-cabal-mode-map (kbd "C-c C-k") 'haskell-process-clear)
-;; (define-key haskell-cabal-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build)
-;; (define-key haskell-cabal-mode-map (kbd "C-c c") 'haskell-process-cabal)
-
-;; shm
+;; keys shm
 (define-key shm-map (kbd "C-c C-p") 'shm/expand-pattern)
 (define-key shm-map (kbd "C-c C-s") 'shm/case-split)
 (define-key shm-map (kbd "C-\\") 'shm/goto-last-point)
--- a/elisp/stack-mode/stack-mode.el	Wed Sep 16 16:53:07 2015 -0500
+++ b/elisp/stack-mode/stack-mode.el	Wed Sep 16 19:27:21 2015 -0500
@@ -52,6 +52,7 @@
                    (interactive-haskell-mode -1)))
                (when stack-mode-manage-flycheck
                  (flycheck-mode 1)
+                 (flycheck-disable-checker 'haskell-ghc)
                  (flycheck-select-checker 'stack-ide)
                  (flycheck-buffer)))
       (when stack-mode-manage-flycheck
@@ -922,6 +923,7 @@
 (flycheck-define-generic-checker 'stack-ide
   "A syntax and type checker for Haskell using Stack's IDE support."
   :start 'stack-mode-flycheck-start
-  :modes '(haskell-mode))
+  :modes '(haskell-mode)
+  :next-checkers '((warning . haskell-hlint)))
 
 (provide 'stack-mode)