[Fix #327] Indentation of a lonely close paren

Indent like this

    (if (pred?)
      )

not like this

    (if (pred?)
        )

Author: Malabarba

clojure-mode.el

@@ -784,12 +784,15 @@ This function also returns nil meaning don't specify the indentation."
         (pcase method
           ((or (pred integerp) `(,method))
            (let ((pos -1))
-             ;; `forward-sexp' will error if indent-point is after
-             ;; the last sexp in the current sexp.
-             (ignore-errors
-               (while (<= (point) indent-point)
-                 (clojure-forward-logical-sexp 1)
-                 (cl-incf pos)))
+             (condition-case nil
+                 (while (<= (point) indent-point)
+                   (clojure-forward-logical-sexp 1)
+                   (cl-incf pos))
+               ;; If indent-point is _after_ the last sexp in the
+               ;; current sexp, we detect that by catching the
+               ;; `scan-error'. In that case, we should return the
+               ;; indentation as if there were an extra sexp at point.
+               (scan-error (cl-incf pos)))
              (cond
               ((= pos (1+ method))
                (+ lisp-body-indent containing-form-column))

test/clojure-mode-indentation-test.el

@@ -211,16 +211,18 @@ values of customisable variables."
 
 
 ;;; Backtracking indent
-(defmacro def-full-indent-test (name form)
-  "Verify that FORM corresponds to a properly indented sexp."
+(defmacro def-full-indent-test (name &rest forms)
+  "Verify that all FORMs correspond to a properly indented sexps."
   (declare (indent 1))
   `(ert-deftest ,(intern (format "test-backtracking-%s" name)) ()
-     (with-temp-buffer
-       (clojure-mode)
-       (insert "\n" ,(replace-regexp-in-string "\n +" "\n " form))
-       (indent-region (point-min) (point-max))
-       (should (equal (buffer-string)
-                      ,(concat "\n" form))))))
+     (progn
+       ,@(dolist (form forms)
+           `(with-temp-buffer
+              (clojure-mode)
+              (insert "\n" ,(replace-regexp-in-string "\n +" "\n " form))
+              (indent-region (point-min) (point-max))
+              (should (equal (buffer-string)
+                             ,(concat "\n" form))))))))
 
 (def-full-indent-test closing-paren
   "(ns ca
@@ -266,6 +268,17 @@ values of customisable variables."
   "#?@ (:clj []
      :cljs [])")
 
+(def-full-indent-test empty-close-paren
+  "(let [x]
+  )"
+
+  "(ns ok
+  )"
+
+  "(ns ^{:zen :dikar}
+    ok
+  )")
+
 
 ;;; Misc