Make clojure-align cleanup commas

Author: Malabarba

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Bugs fixed
 
 * [#371](https://github.com/clojure-emacs/clojure-mode/issues/371): Don't font-lock `:foo/def` like a `def` form.
+* [#367](https://github.com/clojure-emacs/clojure-mode/issues/367): `clojure-align` no longer gets confused with commas. In fact, now it even removes extra commas.
 
 ### New features
 

clojure-mode.el

@@ -891,7 +891,7 @@ return point."
   (unwind-protect
       (ignore-errors
         (clojure-forward-logical-sexp 1)
-        (search-forward-regexp "\\( *\\)" bound)
+        (search-forward-regexp "\\([,\s\t]*\\)" bound)
         (pcase (syntax-after (point))
           ;; End-of-line, try again on next line.
           (`(12) (clojure--search-whitespace-after-next-sexp bound))
@@ -1458,7 +1458,7 @@ Returns a list pair, e.g. (\"defn\" \"abc\") or (\"deftest\" \"some-test\")."
 Sexps that don't represent code are ^metadata or #reader.macros."
   (comment-normalize-vars)
   (comment-forward (point-max))
-  (looking-at-p "\\^\\|#[?[:alpha:]]\\|,"))
+  (looking-at-p "\\^\\|#[?[:alpha:]]"))
 
 (defun clojure-forward-logical-sexp (&optional n)
   "Move forward N logical sexps.
@@ -1472,9 +1472,9 @@ This will skip over sexps that don't represent objects, so that ^hints and
       (while (> n 0)
         (while (clojure--looking-at-non-logical-sexp)
           (forward-sexp 1))
-        (skip-chars-forward ",")
         ;; The actual sexp
         (forward-sexp 1)
+        (skip-chars-forward ",")
         (setq n (1- n))))))
 
 (defun clojure-backward-logical-sexp (&optional n)

test/clojure-mode-indentation-test.el

@@ -546,6 +546,12 @@ x
  :b {:a  :a,
      :aa :a}}")
 
+(ert-deftest clojure-align-remove-extra-commas ()
+  (with-temp-buffer
+    (clojure-mode)
+    (insert "{:a 2, ,:c 4}")
+    (call-interactively #'clojure-align)
+    (should (string= (buffer-string) "{:a 2, :c 4}"))))
 
 ;;; Misc
 

test/clojure-mode-sexp-test.el

@@ -22,6 +22,16 @@
 (require 'clojure-mode)
 (require 'ert)
 
+(ert-deftest test-sexp-with-commas ()
+  (with-temp-buffer
+    (insert "[], {}, :a, 2")
+    (clojure-mode)
+    (goto-char (point-min))
+    (clojure-forward-logical-sexp 1)
+    (should (looking-back " {}, :a, 2"))
+    (clojure-forward-logical-sexp 1)
+    (should (looking-at-p " :a, 2"))))
+
 (ert-deftest test-sexp ()
   (with-temp-buffer
     (insert "^String #macro ^dynamic reverse")