Make indentation of special arguments customisable (#582)

Allow control of the indentation of special arguments through a defcustom.

- introduces clojure-special-arg-indent-factor, which is used as a factor of
lisp-body-ident to indent special arguments.  Defaults to 2, the currently hard
coded value for this.

Author: hugoduncan

CHANGELOG.md

@@ -11,6 +11,7 @@
 * [#571](https://github.com/clojure-emacs/clojure-mode/issues/571): Remove `project.el` integration.
 * [#574](https://github.com/clojure-emacs/clojure-mode/issues/574): Remove `clojure-view-grimoire` command.
 * Stop `clojure-sort-ns` from calling `redisplay`
+* Add 'clojure-special-arg-indent-factor' to control special argument indentation.
 
 ## 5.12.0 (2020-08-13)
 

README.md

@@ -223,6 +223,24 @@ For instructions on how to write these specifications, see
 [this document](https://docs.cider.mx/cider/indent_spec.html).
 The only difference is that you're allowed to use lists instead of vectors.
 
+The indentation of special arguments is controlled by
+`clojure-special-arg-indent-factor`, which by default indents special arguments
+a further `lisp-body-indent` when compared to ordinary arguments.
+
+An example of the default formatting is:
+
+```clojure
+(defrecord MyRecord
+    [my-field])
+```
+
+Setting `clojure-special-arg-indent-factor` to 1, results in:
+
+```clojure
+(defrecord MyRecord
+  [my-field])
+```
+
 ### Indentation of Comments
 
 `clojure-mode` differentiates between comments like `;`, `;;`, etc.

clojure-mode.el

@@ -1142,6 +1142,13 @@ will align the values like this:
   :safe #'listp
   :type '(repeat string))
 
+(defcustom clojure-special-arg-indent-factor
+  2
+  "Factor of the 'lisp-body-indent' used to indent special arguments."
+  :package-version '(clojure-mode . "5.13")
+  :type 'integer
+  :safe 'integerp)
+
 (defvar clojure--beginning-of-reader-conditional-regexp
   "#\\?@(\\|#\\?("
   "Regexp denoting the beginning of a reader conditional.")
@@ -1509,7 +1516,8 @@ This function also returns nil meaning don't specify the indentation."
              (clojure--normal-indent last-sexp 'always-align))
             ;; Special arg. Rigidly indent with a large indentation.
             (t
-             (+ (* 2 lisp-body-indent) containing-form-column)))))
+             (+ (* clojure-special-arg-indent-factor lisp-body-indent)
+                containing-form-column)))))
         (`:defn
          (+ lisp-body-indent containing-form-column))
         ((pred functionp)

test/clojure-mode-indentation-test.el

@@ -233,6 +233,51 @@ DESCRIPTION is a string with the description of the spec."
       (ala/bala top
         |one)"))
 
+  (describe "specify an indentation for symbol"
+    (put-clojure-indent 'cala 1)
+
+    (when-indenting-with-point-it "should handle a symbol with ns"
+      "
+      (cala top
+      |one)"
+      "
+      (cala top
+        |one)")
+    (when-indenting-with-point-it "should handle special arguments"
+      "
+      (cala
+       |top
+        one)"
+      "
+      (cala
+          |top
+        one)"))
+  (describe "should respect special argument indentation"
+    :var (clojure-special-arg-indent-factor)
+    (before-each
+     (setq clojure-special-arg-indent-factor 1))
+    (after-each
+     (setq clojure-special-arg-indent-factor 2))
+
+    (put-clojure-indent 'cala 1)
+
+    (when-indenting-with-point-it "should handle a symbol with ns"
+      "
+      (cala top
+      |one)"
+      "
+      (cala top
+        |one)")
+    (when-indenting-with-point-it "should handle special arguments"
+      "
+      (cala
+       |top
+        one)"
+      "
+      (cala
+        |top
+        one)"))
+
   (describe "we can pass a lambda to explicitly set the column"
     (put-clojure-indent 'arsymbol (lambda (indent-point state) 0))