Stylish-haskell runs on buffer instead of file on disk

Author: wraithm

haskell-commands.el

@@ -789,47 +789,43 @@ inferior GHCi process."
 Use buffer as input and replace the whole buffer with the
 output.  If CMD fails the buffer remains unchanged."
   (set-buffer-modified-p t)
-  (let* ((chomp (lambda (str)
-                  (while (string-match "\\`\n+\\|^\\s-+\\|\\s-+$\\|\n+\\'" str)
-                    (setq str (replace-match "" t t str)))
-                  str))
-         (_errout (lambda (fmt &rest args)
-                    (let* ((warning-fill-prefix "    "))
-                      (display-warning cmd (apply 'format fmt args) :warning))))
-         (filename (buffer-file-name (current-buffer)))
-         (cmd-prefix (replace-regexp-in-string " .*" "" cmd))
-         (tmp-file (make-temp-file cmd-prefix))
-         (err-file (make-temp-file cmd-prefix))
+  (let* ((tmp-buf (generate-new-buffer "stylish-output"))
+         (err-file (make-temp-file "stylish-error"))
          (default-directory (if (and (boundp 'haskell-session)
                                      haskell-session)
                                 (haskell-session-cabal-dir haskell-session)
-                              default-directory))
-         (_errcode (with-temp-file tmp-file
-                     (call-process cmd filename
-                                   (list (current-buffer) err-file) nil)))
-         (stderr-output
-          (with-temp-buffer
-            (insert-file-contents err-file)
-            (funcall chomp (buffer-substring-no-properties (point-min) (point-max)))))
-         (stdout-output
-          (with-temp-buffer
-            (insert-file-contents tmp-file)
-            (buffer-substring-no-properties (point-min) (point-max)))))
-    (if (string= "" stderr-output)
-        (if (string= "" stdout-output)
-            (message "Error: %s produced no output, leaving buffer alone" cmd)
-          (save-restriction
-            (widen)
-            ;; command successful, insert file with replacement to preserve
-            ;; markers.
-            (insert-file-contents tmp-file nil nil nil t)))
-      (progn
-        ;; non-null stderr, command must have failed
-        (message "Error: %s ended with errors, leaving buffer alone" cmd)
-        ;; use (warning-minimum-level :debug) to see this
-        (display-warning cmd stderr-output :debug)))
-    (delete-file tmp-file)
-    (delete-file err-file)))
+                              default-directory)))
+        (unwind-protect
+          (let* ((_errcode
+                  (call-process-region (point-min) (point-max) cmd nil
+                                       (list (buffer-name tmp-buf) err-file)
+                                       nil))
+                 (stderr-output
+                  (with-temp-buffer
+                    (insert-file-contents err-file)
+                    (buffer-substring-no-properties (point-min) (point-max))))
+                 (stdout-output
+                  (with-temp-buffer
+                    (insert-buffer-substring tmp-buf)
+                    (buffer-substring-no-properties (point-min) (point-max)))))
+            (if (string= "" stderr-output)
+                (if (string= "" stdout-output)
+                    (message "Error: %s produced no output, leaving buffer alone" cmd)
+                  (save-restriction
+                    (widen)
+                    ;; command successful, insert file with replacement to preserve
+                    ;; markers.
+                    (erase-buffer)
+                    (insert-buffer-substring tmp-buf)))
+              (progn
+                ;; non-null stderr, command must have failed
+                (message "Error: %s ended with errors, leaving buffer alone" cmd)
+                ;; use (warning-minimum-level :debug) to see this
+                (display-warning cmd stderr-output :debug))))
+          (ignore-errors
+            (delete-file err-file))
+          (ignore-errors
+            (kill-buffer tmp-buf)))))
 
 ;;;###autoload
 (defun haskell-mode-find-uses ()

haskell-mode.el

@@ -1055,7 +1055,8 @@ To be added to `flymake-init-create-temp-buffer-copy'."
 
 (defun haskell-mode-before-save-handler ()
   "Function that will be called before buffer's saving."
-  )
+  (when haskell-stylish-on-save
+    (ignore-errors (haskell-mode-stylish-buffer))))
 
 ;; From Bryan O'Sullivan's blog:
 ;; http://www.serpentine.com/blog/2007/10/09/using-emacs-to-insert-scc-annotations-in-haskell-code/

haskell.el

@@ -361,12 +361,8 @@ Give optional NEXT-P parameter to override value of
 ;;;###autoload
 (defun haskell-mode-after-save-handler ()
   "Function that will be called after buffer's saving."
-  (when haskell-tags-on-save (ignore-errors (haskell-mode-generate-tags)))
-  (when haskell-stylish-on-save
-    (ignore-errors (haskell-mode-stylish-buffer))
-    (let ((before-save-hook '())
-          (after-save-hook '()))
-      (basic-save-buffer))))
+  (when haskell-tags-on-save
+    (ignore-errors (haskell-mode-generate-tags))))
 
 ;;;###autoload
 (defun haskell-mode-tag-find (&optional _next-p)