Rename convert-shorthand-fn -> promote-fn-literal

Author: yuhan0

clojure-mode.el

@@ -2769,8 +2769,8 @@ With a numeric prefix argument the let is introduced N lists up."
   (interactive)
   (clojure--move-to-let-internal (read-from-minibuffer "Name of bound symbol: ")))
 
-;;; Shorthand fn conversion
-(defun clojure--gather-shorthand-args ()
+;;; Promoting #() function literals
+(defun clojure--gather-fn-literal-args ()
   "Return a cons cell (ARITY . VARARG)
 ARITY is number of arguments in the function,
 VARARG is a boolean of whether it takes a variable argument %&."
@@ -2790,7 +2790,7 @@ VARARG is a boolean of whether it takes a variable argument %&."
                            (string-to-number s))))))))
       (cons arity vararg))))
 
-(defun clojure--substitute-shorthand-arg (arg sub end)
+(defun clojure--substitute-fn-literal-arg (arg sub end)
   "ARG is either a number or the symbol '&.
 SUB is a string to substitute with, and
 END marks the end of the fn expression"
@@ -2801,7 +2801,7 @@ END marks the end of the fn expression"
                    (not (clojure--in-string-p)))
           (replace-match sub))))))
 
-(defun clojure-convert-shorthand-fn ()
+(defun clojure-promote-fn-literal ()
   "Convert a #(...) function into (fn [...] ...), prompting for the argument names."
   (interactive)
   (when-let (beg (clojure-string-start))
@@ -2810,7 +2810,7 @@ END marks the end of the fn expression"
           (ignore-errors (forward-char 1))
           (re-search-backward "#(" (save-excursion (beginning-of-defun) (point)) 'noerror))
       (let* ((end (save-excursion (clojure-forward-logical-sexp) (point-marker)))
-             (argspec (clojure--gather-shorthand-args))
+             (argspec (clojure--gather-fn-literal-args))
              (arity (car argspec))
              (vararg (cdr argspec)))
         (delete-char 1)
@@ -2822,14 +2822,14 @@ END marks the end of the fn expression"
                   (let ((name (read-string (format "Name of argument %d: " n))))
                     (when (/= n 1) (insert " "))
                     (insert name)
-                    (clojure--substitute-shorthand-arg n name end)))
+                    (clojure--substitute-fn-literal-arg n name end)))
                 (number-sequence 1 arity))
           (when vararg
             (insert " & ")
             (let ((name (read-string "Name of variadic argument: ")))
               (insert name)
-              (clojure--substitute-shorthand-arg '& name end)))))
-    (user-error "No #() shorthand at point!")))
+              (clojure--substitute-fn-literal-arg '& name end)))))
+    (user-error "No #() literal at point!")))
 
 ;;; Renaming ns aliases
 

test/clojure-mode-convert-fn-test.el …/clojure-mode-promote-fn-literal-test.eltest/clojure-mode-convert-fn-test.el renamed to test/clojure-mode-promote-fn-literal-test.el test/clojure-mode-convert-fn-test.el renamed to test/clojure-mode-promote-fn-literal-test.el

@@ -1,4 +1,4 @@
-;;; clojure-mode-convert-fn-test.el --- Clojure Mode: convert fn syntax -*- lexical-binding: t; -*-
+;;; clojure-mode-promote-fn-literal-test.el --- Clojure Mode: convert fn syntax -*- lexical-binding: t; -*-
 
 ;; This file is not part of GNU Emacs.
 
@@ -17,14 +17,14 @@
 
 ;;; Commentary:
 
-;; Tests for clojure-convert-shorthand-fn
+;; Tests for clojure-promote-fn-literal
 
 ;;; Code:
 
 (require 'clojure-mode)
 (require 'buttercup)
 
-(describe "clojure-convert-shorthand-fn"
+(describe "clojure-promote-fn-literal"
   :var (names)
 
   (before-each
@@ -34,19 +34,19 @@
   (when-refactoring-it "should convert 0-arg fns"
     "#(rand)"
     "(fn [] (rand))"
-    (clojure-convert-shorthand-fn))
+    (clojure-promote-fn-literal))
 
   (when-refactoring-it "should convert 1-arg fns"
     "#(= % 1)"
     "(fn [x] (= x 1))"
     (setq names '("x"))
-    (clojure-convert-shorthand-fn))
+    (clojure-promote-fn-literal))
 
   (when-refactoring-it "should convert 2-arg fns"
-    "#(conj (pop %1) (assoc (peek %1) %2 (* %2 %2)))"
+    "#(conj (pop %) (assoc (peek %1) %2 (* %2 %2)))"
     "(fn [acc x] (conj (pop acc) (assoc (peek acc) x (* x x))))"
     (setq names '("acc" "x"))
-    (clojure-convert-shorthand-fn))
+    (clojure-promote-fn-literal))
 
   (when-refactoring-it "should convert variadic fns"
     ;; from https://hypirion.com/musings/swearjure
@@ -55,18 +55,18 @@
     "(fn [v & vs] (* (`[~@vs] (+))
    ((v (+)) v (- (`[~@vs] (+)) (*)))))"
     (setq names '("v" "vs"))
-    (clojure-convert-shorthand-fn))
+    (clojure-promote-fn-literal))
 
   (when-refactoring-it "should ignore strings and comments"
     "#(format \"%2\" ;; FIXME: %2 is an illegal specifier
    %7) "
     "(fn [_ _ _ _ _ _ id] (format \"%2\" ;; FIXME: %2 is an illegal specifier
    id)) "
     (setq names '("_" "_" "_" "_" "_" "_" "id"))
-    (clojure-convert-shorthand-fn)))
+    (clojure-promote-fn-literal)))
 
 
 (provide 'clojure-mode-convert-fn-test)
 
 
-;;; clojure-mode-convert-fn-test.el ends here
+;;; clojure-mode-promote-fn-literal-test.el ends here