[Fix #360] Reindent after aligning

clojure-emacs · Jan 16, 2016 · f9f3100 · f9f3100 · bbatsov · Jan 16, 2016
1 parent b26d632
commit f9f3100
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/clojure-mode.el b/clojure-mode.el
@@ -825,16 +825,18 @@ When called from lisp code align everything between BEG and END."
   (save-excursion
     (goto-char beg)
     (while (clojure--find-sexp-to-align end)
-      (align-region (point)
-                    (save-excursion
-                      (backward-up-list)
-                      (forward-sexp 1)
-                      (point))
-                    nil
-                    '((clojure-align (regexp . clojure--search-whitespace-after-next-sexp)
-                                     (group . 1)
-                                     (repeat . t)))
-                    nil))))
+      (let ((sexp-end (save-excursion
+                        (backward-up-list)
+                        (forward-sexp 1)
+                        (point-marker)))
+            (clojure-align-forms-automatically nil))
+        (align-region (point) sexp-end nil
+                      '((clojure-align (regexp . clojure--search-whitespace-after-next-sexp)
+                                       (group . 1)
+                                       (repeat . t)))
+                      nil)
+        ;; Reindent after aligning because of #360.
+        (indent-region (point) sexp-end)))))
 
 ;;; Indentation
 (defun clojure-indent-region (beg end)

diff --git a/test/clojure-mode-indentation-test.el b/test/clojure-mode-indentation-test.el
@@ -489,6 +489,11 @@ x
       how      well
       multiple words will work)")
 
+(def-full-align-test nested-maps
+  "{:a {:a :a
+     :bbbb :b}
+ :bbbb :b}")
+
 
 ;;; Misc