Merge pull request #718 from patrl/improve-dante

Refactored +dante feature

modules/lang/haskell/+dante.el

@@ -2,17 +2,8 @@
 ;;;###if (featurep! +dante)
 
 (def-package! dante
-  :after haskell-mode
+  :hook haskell-mode
-  :hook (haskell-mode . dante-mode)
   :config
-  (add-hook 'haskell-mode-hook #'interactive-haskell-mode))
+  (when (featurep! :feature syntax-checker)
-
+    (add-hook! 'dante-mode-hook
-
+      (flycheck-add-next-checker 'haskell-dante '(warning . haskell-hlint)))))
-(def-package! company-ghc
-  :when (featurep! :completion company)
-  :after haskell-mode
-  :init
-  (add-hook 'haskell-mode-hook #'ghc-comp-init)
-  :config
-  (setq company-ghc-show-info 'oneline)
-  (set-company-backend! 'haskell-mode #'company-ghc))

modules/lang/haskell/doctor.el

@@ -4,9 +4,8 @@
 (when (featurep! +dante)
   (unless (executable-find "cabal")
     (warn! "Couldn't find cabal, haskell-mode may have issues"))
-
+  (unless (executable-find "hlint")
-  (unless (executable-find "ghc-mod")
+    (warn! "Couldn't find hlint. Flycheck may have issues in haskell-mode/")))
-    (warn! "Couldn't find ghc-mod on PATH. Code completion will not work")))
 
 (when (featurep! +intero)
   (unless (executable-find "stack")

modules/lang/haskell/packages.el

@@ -5,9 +5,7 @@
 
 ;;
 (cond ((featurep! +dante)
-       (package! dante)
+       (package! dante))
-       (when (featurep! :completion company)
-         (package! company-ghc)))
       (t
        (package! intero)
        (package! hindent)))