lang/haskell: fix ESC ESC keybind in REPL; move company-ghc to +dante

modules/lang/haskell/+dante.el

@@ -11,3 +11,15 @@
   (add-hook 'haskell-mode-hook #'interactive-haskell-mode)
   (add-hook 'dante-mode-hook #'flycheck-mode))
 
+
+(def-package! company-ghc
+  :when (featurep! :completion company)
+  :after haskell-mode
+  :init
+  (add-hook 'haskell-mode-hook #'ghc-comp-init)
+  :config
+  (unless (executable-find "ghc-mod")
+    (warn! "Couldn't find ghc-mod on PATH. Code completion is disabled."))
+
+  (setq company-ghc-show-info 'oneline)
+  (set! :company-backend 'haskell-mode #'company-ghc))

modules/lang/haskell/config.el

@@ -20,18 +20,5 @@
 
   (autoload 'switch-to-haskell "inf-haskell" nil t)
   (after! inf-haskell
-    (map! :map inferior-haskell-mode-map "ESC ESC" #'doom/popup-close)))
+    (map! :map inferior-haskell-mode-map "ESC ESC" #'+popup/close)))
-
-
-(def-package! company-ghc
-  :when (featurep! :completion company)
-  :after haskell-mode
-  :init
-  (add-hook 'haskell-mode-hook #'ghc-comp-init)
-  :config
-  (unless (executable-find "ghc-mod")
-    (warn! "Couldn't find ghc-mod on PATH. Code completion is disabled."))
-
-  (setq company-ghc-show-info 'oneline)
-  (set! :company-backend 'haskell-mode #'company-ghc))
 

modules/lang/haskell/packages.el

@@ -2,12 +2,12 @@
 ;;; lang/haskell/packages.el
 
 (package! haskell-mode)
-(when (featurep! :completion company)
-  (package! company-ghc))
 
 ;;
 (cond ((featurep! +dante)
-       (package! dante))
+       (package! dante)
+       (when (featurep! :completion company)
+         (package! company-ghc)))
       (t
        (package! intero)
        (package! hindent)))