Add reader conditional support to the add arity refactoring.

Author: anthonygalea

clojure-mode.el

@@ -2740,10 +2740,10 @@ With a numeric prefix argument the let is introduced N lists up."
 (defun clojure-add-arity ()
   "Add an arity to a function."
   (interactive)
-  (let ((end (save-excursion (end-of-defun)
-                             (point)))
-        (beg (progn (beginning-of-defun)
-                    (point))))
+  (let ((beg (progn (re-search-backward "(defn")
+                    (point)))
+        (end (save-excursion (forward-sexp)
+                             (point))))
     (down-list 2)
     (when (looking-back "{" 1) ;; skip metadata if present
       (up-list)
@@ -2757,16 +2757,15 @@ With a numeric prefix argument the let is introduced N lists up."
       (let* ((bol (save-excursion (beginning-of-line) (point)))
              (same-line (save-excursion (re-search-backward "defn" bol t)))
              (new-arity-text (concat (when same-line "\n") "([])\n[")))
-        (re-search-backward " +\\[")
-        (replace-match new-arity-text)
         (save-excursion
-          (end-of-defun)
-          (re-search-backward ")")
+          (goto-char end)
           (insert ")"))
-        (left-char)
-        (insert "(")
+
+        (re-search-backward " +\\[")
+        (replace-match new-arity-text)
+
         (indent-region beg end)
-        (left-char 6))))))
+        (left-char 7))))))
 
 
 ;;; ClojureScript

test/clojure-mode-refactor-add-arity-test.el

@@ -149,6 +149,54 @@ DESCRIPTION is a string with the description of the spec."
   ([arg]
    body))"
 
+    (clojure-add-arity))
+
+  (when-refactoring-with-point-it "should handle a defn inside a reader conditional"
+    "#?(:clj
+   (defn foo
+     \"some docstring\"
+     ^{:bla \"meta\"}
+     |([arg]
+      body)))"
+
+    "#?(:clj
+   (defn foo
+     \"some docstring\"
+     ^{:bla \"meta\"}
+     ([|])
+     ([arg]
+      body)))"
+
+    (clojure-add-arity))
+
+  (when-refactoring-with-point-it "should handle a defn inside a reader conditional with 2 platform tags"
+    "#?(:clj
+   (defn foo
+     \"some docstring\"
+     ^{:bla \"meta\"}
+     |([arg]
+      body))
+   :cljs
+   (defn foo
+     \"some docstring\"
+     ^{:bla \"meta\"}
+     ([arg]
+      body)))"
+
+    "#?(:clj
+   (defn foo
+     \"some docstring\"
+     ^{:bla \"meta\"}
+     ([|])
+     ([arg]
+      body))
+   :cljs
+   (defn foo
+     \"some docstring\"
+     ^{:bla \"meta\"}
+     ([arg]
+      body)))"
+
     (clojure-add-arity)))
 
 (provide 'clojure-mode-refactor-add-arity-test)