Merge pull request #1619 from fommil/haskell-compile-improve

haskell-compile supports stack too

Author: gregorycollins

haskell-compile.el

@@ -29,6 +29,7 @@
 (require 'compile)
 (require 'haskell-cabal)
 (require 'ansi-color)
+(eval-when-compile (require 'subr-x))
 
 ;;;###autoload
 (defgroup haskell-compile nil
@@ -37,16 +38,30 @@
   :group 'haskell)
 
 (defcustom haskell-compile-cabal-build-command
-  "cd %s && cabal build --ghc-option=-ferror-spans"
+  "cabal build --ghc-option=-ferror-spans"
   "Default build command to use for `haskell-cabal-build' when a cabal file is detected.
-The `%s' placeholder is replaced by the cabal package top folder."
+For legacy compat, `%s' is replaced by the cabal package top folder."
   :group 'haskell-compile
   :type 'string)
 
 (defcustom haskell-compile-cabal-build-alt-command
-  "cd %s && cabal clean -s && cabal build --ghc-option=-ferror-spans"
+  "cabal clean -s && cabal build --ghc-option=-ferror-spans"
   "Alternative build command to use when `haskell-cabal-build' is called with a negative prefix argument.
-The `%s' placeholder is replaced by the cabal package top folder."
+For legacy compat, `%s' is replaced by the cabal package top folder."
+  :group 'haskell-compile
+  :type 'string)
+
+(defcustom haskell-compile-stack-build-command
+  "stack build --fast"
+  "Default build command to use for `haskell-stack-build' when a stack file is detected.
+For legacy compat, `%s' is replaced by the stack package top folder."
+  :group 'haskell-compile
+  :type 'string)
+
+(defcustom haskell-compile-stack-build-alt-command
+  "stack clean && stack build --fast"
+  "Alternative build command to use when `haskell-stack-build' is called with a negative prefix argument.
+For legacy compat, `%s' is replaced by the stack package top folder."
   :group 'haskell-compile
   :type 'string)
 
@@ -63,6 +78,13 @@ The `%s' placeholder is replaced by the current buffer's filename."
   :group 'haskell-compile
   :type 'boolean)
 
+(defcustom haskell-compile-ignore-cabal nil
+  "Ignore cabal build definitions files for this buffer when detecting the build tool."
+  :group 'haskell-compile
+  :type 'boolean)
+(make-variable-buffer-local 'haskell-compile-ignore-cabal)
+(put 'haskell-compile-ignore-cabal 'safe-local-variable #'booleanp)
+
 (defconst haskell-compilation-error-regexp-alist
   `((,(concat
        "^ *\\(?1:[^\t\r\n]+?\\):"
@@ -121,42 +143,76 @@ messages pointing to additional source locations."
 
 ;;;###autoload
 (defun haskell-compile (&optional edit-command)
-  "Compile the Haskell program including the current buffer.
-Tries to locate the next cabal description in current or parent
-folders via `haskell-cabal-find-dir' and if found, invoke
-`haskell-compile-cabal-build-command' from the cabal package root
-folder. If no cabal package could be detected,
-`haskell-compile-command' is used instead.
+  "Run a compile command for the current Haskell buffer.
 
-If prefix argument EDIT-COMMAND is non-nil (and not a negative
-prefix `-'), `haskell-compile' prompts for custom compile
-command.
-
-If EDIT-COMMAND contains the negative prefix argument `-',
-`haskell-compile' calls the alternative command defined in
-`haskell-compile-cabal-build-alt-command' if a cabal package was
-detected.
+Locates stack or cabal definitions and, if found, invokes the
+default build command for that build tool. Cabal is preferred
+but may be ignored with `haskell-compile-ignore-cabal'.
 
-`haskell-compile' uses `haskell-compilation-mode' which is
-derived from `compilation-mode'. See Info
-node `(haskell-mode)compilation' for more details."
+If prefix argument EDIT-COMMAND is non-nil (and not a negative
+prefix `-'), prompt for a custom compile command.
+
+If EDIT-COMMAND contains the negative prefix argument `-', call
+the alternative command defined in
+`haskell-compile-stack-build-alt-command' /
+`haskell-compile-cabal-build-alt-command'.
+
+If there is no prefix argument, the most recent custom compile
+command is used, falling back to
+`haskell-compile-stack-build-command' for stack builds
+`haskell-compile-cabal-build-command' for cabal builds, and
+`haskell-compile-command' otherwise.
+
+'% characters in the `-command' templates are replaced by the
+base directory for build tools, or the current buffer for
+`haskell-compile-command'."
   (interactive "P")
   (save-some-buffers (not compilation-ask-about-save)
-                         compilation-save-buffers-predicate)
-  (let* ((cabdir (haskell-cabal-find-dir))
-         (command1 (if (eq edit-command '-)
-                       haskell-compile-cabal-build-alt-command
-                     haskell-compile-cabal-build-command))
-         (srcname (buffer-file-name))
-         (command (if cabdir
-                      (format command1 cabdir)
-                    (if (and srcname (derived-mode-p 'haskell-mode))
-                        (format haskell-compile-command srcname)
-                      command1))))
-    (when (and edit-command (not (eq edit-command '-)))
-      (setq command (compilation-read-command command)))
-
-    (compilation-start command 'haskell-compilation-mode)))
+                     compilation-save-buffers-predicate)
+  (if-let ((cabaldir (and
+                      (not haskell-compile-ignore-cabal)
+                      (or (haskell-cabal-find-dir)
+                          (locate-dominating-file default-directory "cabal.project")
+                          (locate-dominating-file default-directory "cabal.project.local")))))
+      (haskell--compile cabaldir edit-command
+                        'haskell--compile-cabal-last
+                        haskell-compile-cabal-build-command
+                        haskell-compile-cabal-build-alt-command)
+    (if-let ((stackdir (and haskell-compile-ignore-cabal
+                            (locate-dominating-file default-directory "stack.yaml"))))
+        (haskell--compile stackdir edit-command
+                          'haskell--compile-stack-last
+                          haskell-compile-stack-build-command
+                          haskell-compile-stack-build-alt-command)
+      (let ((srcfile (buffer-file-name)))
+        (haskell--compile srcfile edit-command
+                          'haskell--compile-ghc-last
+                          haskell-compile-command
+                          haskell-compile-command)))))
+
+(defvar haskell--compile-stack-last nil)
+(defvar haskell--compile-cabal-last nil)
+(defvar haskell--compile-ghc-last nil)
+(defun haskell--compile (dir-or-file edit last-sym fallback alt)
+  (let* ((default (or (symbol-value last-sym) fallback))
+         (template (pcase edit
+                     ('nil default)
+                     ('-  alt)
+                     (_   (compilation-read-command default))))
+         (command (format template dir-or-file))
+         (dir (if (directory-name-p dir-or-file)
+                  dir-or-file
+                default-directory))
+         (name (if (directory-name-p dir-or-file)
+                   (file-name-base (directory-file-name dir-or-file))
+                 (file-name-nondirectory dir-or-file))))
+    (unless (eq edit'-)
+      (set last-sym template))
+    (let ((default-directory dir))
+      (compilation-start
+       command
+       'haskell-compilation-mode
+       (lambda (mode) (format "*%s* <%s>" mode name))))))
 
 (provide 'haskell-compile)
 ;;; haskell-compile.el ends here