Fix multi-airty indention of deftype & defrecord (clojure-emacs#389)

bpoweski · Jun 26, 2016 · 16b507d · 16b507d
1 parent 6d0dea4
commit 16b507d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/clojure-mode.el b/clojure-mode.el
@@ -1313,8 +1313,8 @@ work).  To set it from Lisp code, use
   (as-> 2)
 
   (reify '(:defn (1)))
-  (deftype '(2 nil nil (1)))
-  (defrecord '(2 nil nil (1)))
+  (deftype '(2 nil nil (:defn)))
+  (defrecord '(2 nil nil (:defn)))
   (defprotocol '(1 (:defn)))
   (extend 1)
   (extend-protocol '(1 :defn))

diff --git a/test/clojure-mode-indentation-test.el b/test/clojure-mode-indentation-test.el
@@ -280,6 +280,15 @@ values of customisable variables."
     ([item a]
      (* a (:qty item)))))")
 
+(def-full-indent-test deftype-allow-multiarity
+  "(deftype Banana []
+  Fruit
+  (subtotal
+    ([item]
+     (* 158 (:qty item)))
+    ([item a]
+     (* a (:qty item)))))")
+
 (def-full-indent-test defprotocol
   "(defprotocol IFoo
   (foo [this]
@@ -326,6 +335,15 @@ values of customisable variables."
   SomeType (assoc [_ x]
              (.assoc pretty x 10)))")
 
+(def-full-indent-test defrecord-allow-multiarity
+  "(defrecord Banana []
+  Fruit
+  (subtotal
+    ([item]
+     (* 158 (:qty item)))
+    ([item a]
+     (* a (:qty item)))))")
+
 (def-full-indent-test letfn
   "(letfn [(f [x]
           (* x 2))