Merge pull request #1003 from bergey/do-not-sort-imports-twice

Do not sort imports twice

Author: gracjan

haskell-customize.el

@@ -404,6 +404,13 @@ same vein as `haskell-indent-spaces'."
   :group 'haskell
   :type '(repeat 'string))
 
+;;;###autoload
+(defcustom haskell-stylish-on-save nil
+  "Whether to run stylish-haskell on the buffer before saving.
+If this is true, `haskell-add-import' will not sort or align the
+imports."
+  :group 'haskell
+  :type 'boolean)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Accessor functions

haskell-mode.el

@@ -820,12 +820,6 @@ Note that negative arguments do not work so well."
                  (const "ghc -fno-code")
                  (string :tag "Other command")))
 
-;;;###autoload
-(defcustom haskell-stylish-on-save nil
-  "Whether to run stylish-haskell on the buffer before saving."
-  :group 'haskell
-  :type 'boolean)
-
 ;;;###autoload
 (defcustom haskell-tags-on-save nil
   "Generate tags via hasktags after saving."

haskell-modules.el

@@ -23,9 +23,12 @@
 (require 'haskell-navigate-imports)
 (require 'haskell-complete-module)
 (require 'haskell-sandbox)
+(require 'haskell-customize)
 
 (defun haskell-add-import (&optional module)
-  "Add an import to the import list."
+  "Add an import to the import list.  Sorts and aligns imports,
+unless `haskell-stylish-on-save' is set, in which case we defer
+to stylish-haskell."
   (interactive)
   (save-excursion
     (goto-char (point-max))
@@ -35,8 +38,8 @@
                  (haskell-complete-module-read
                   "Module: "
                   (haskell-session-all-modules (haskell-modules-session))))))
-    (haskell-sort-imports)
-    (haskell-align-imports)))
+    (unless haskell-stylish-on-save (haskell-sort-imports)
+            (haskell-align-imports))))
 
 (defun haskell-import-for-module (module)
   "Get import statements for the given module."