Update test; Add comments.

Author: samwagg

clojure-mode.el

@@ -1251,7 +1251,9 @@ Place point as in `clojure--position-for-alignment'."
     found))
 
 (defun clojure--search-whitespace-after-next-sexp (&optional bound _noerror)
-  "Move point after all whitespace after the next sexp.
+  "Move point after all whitespace after the next sexp.  Also move
+past a comment, if one exists (this is only possible when the end of
+the sexp coincides with the end of a line).
 
 Set the match data group 1 to be this region of whitespace and
 return point.
@@ -1260,6 +1262,7 @@ BOUND is bounds the whitespace search."
   (unwind-protect
       (ignore-errors
         (clojure-forward-logical-sexp 1)
+        ;; Move past any whitespace or comment.
         (search-forward-regexp "\\([,\s\t]*\\)\\(;+.*\\)?" bound)
         (pcase (syntax-after (point))
           ;; End-of-line, try again on next line.

test/clojure-mode-indentation-test.el

@@ -705,10 +705,24 @@ x
     "#?@(:clj  [2]
     :cljs [2])")
 
-  (when-aligning-it "should work correctly when margin comments appear after multi-line, non-terminal sexps"
-    "(let [:x (+ 2 3
-            3 4) ; comment
-      :y (+ 1 2)])")
+  (when-aligning-it "should work correctly when margin comments appear after nested, multi-line, non-terminal sexps"
+    "
+(let [x  {:a 1
+          :b 2} ; comment
+      xx 3]
+  x)"
+
+    "
+{:aa {:b  1
+      :cc 2} ; comment
+ :a  1}}"
+
+    "
+(case x
+  :a  (let [a  1
+            aa (+ a 1)]
+       aa); comment
+  :aa 2)")
 
   (it "should handle improperly indented content"
     (let ((content "(let [a-long-name 10\nb 20])")