Add refresh-mode flags to the namespace transient menu

Expose cider-ns-refresh's modes as explicit toggles on cider-ns-menu
(--all, --clear, --inhibit-fns), instead of the undiscoverable single/
double/negative prefix arguments. cider-ns-refresh now also accepts a list
of mode symbols (backward compatible with the scalar symbol/prefix forms),
so the orthogonal inhibit-fns can combine with reload-all or clear.

Author: bbatsov

lisp/cider-mode.el

@@ -522,15 +522,31 @@ If invoked with a prefix ARG eval the expression after inserting it."
   "CIDER NS keymap.")
 
 ;;;###autoload (autoload 'cider-ns-menu "cider-mode" "Menu for CIDER's namespace commands." t)
+(transient-define-suffix cider-ns-menu--refresh (args)
+  "Refresh namespaces, applying the menu's refresh ARGS.
+`--all', `--clear' and `--inhibit-fns' map to the corresponding
+`cider-ns-refresh' modes; with none set it does a smart reload."
+  (interactive (list (transient-args 'cider-ns-menu)))
+  (cider-ns-refresh
+   (delq nil (list (and (member "--all" args) 'refresh-all)
+                   (and (member "--clear" args) 'clear)
+                   (and (member "--inhibit-fns" args) 'inhibit-fns)))))
+
 (transient-define-prefix cider-ns-menu ()
-  "Transient menu for CIDER's namespace commands."
+  "Transient menu for CIDER's namespace commands.
+The refresh arguments make `cider-ns-refresh's modes (otherwise reached
+via prefix arguments) explicit toggles."
+  ["Refresh arguments"
+   ("-a" "Reload all (unconditionally)" "--all")
+   ("-c" "Clear the tracker first" "--clear")
+   ("-i" "Inhibit refresh functions" "--inhibit-fns")]
   [["Namespace"
     ("b" "Browse namespace" cider-browse-ns)
     ("f" "Find namespace" cider-find-ns)
     ("n" "Set REPL namespace" cider-repl-set-ns)
     ("e" "Eval namespace form" cider-eval-ns-form)]
    ["Reload"
-    ("r" "Refresh (smart reload)" cider-ns-refresh)
+    ("r" "Refresh (smart reload)" cider-ns-menu--refresh)
     ("l" "Require and reload" cider-ns-reload)
     ("L" "Require and reload all" cider-ns-reload-all)]]
   ;; Meta-variant duplicates, hidden from the menu, preserving muscle memory.
@@ -539,7 +555,7 @@ If invoked with a prefix ARG eval the expression after inserting it."
    ("M-f" "Find namespace" cider-find-ns)
    ("M-n" "Set REPL namespace" cider-repl-set-ns)
    ("M-e" "Eval namespace form" cider-eval-ns-form)
-   ("M-r" "Refresh (smart reload)" cider-ns-refresh)
+   ("M-r" "Refresh (smart reload)" cider-ns-menu--refresh)
    ("M-l" "Require and reload all" cider-ns-reload-all)])
 
 ;;;###autoload (autoload 'cider-menu "cider-mode" "Top-level transient menu for CIDER." t)

lisp/cider-ns.el

@@ -359,11 +359,15 @@ unloaded.
 
 With a negative prefix argument, or if MODE is `inhibit-fns', prevent any
 refresh functions (defined in `cider-ns-refresh-before-fn' and
-`cider-ns-refresh-after-fn') from being invoked."
+`cider-ns-refresh-after-fn') from being invoked.
+
+MODE may also be a list combining these symbols (e.g. \\='(refresh-all
+inhibit-fns)), which is how `cider-ns-menu' passes its arguments."
   (interactive "p")
-  (let ((clear? (member mode '(clear 16)))
-        (all? (member mode '(refresh-all 4)))
-        (inhibit-refresh-fns (member mode '(inhibit-fns -1))))
+  (let* ((modes (if (listp mode) mode (list mode)))
+         (clear? (or (memq 'clear modes) (memq 16 modes)))
+         (all? (or (memq 'refresh-all modes) (memq 4 modes)))
+         (inhibit-refresh-fns (or (memq 'inhibit-fns modes) (memq -1 modes))))
     (cider-map-repls '(:clj "cider/refresh" "cider.clj-reload/reload")
       (lambda (conn)
         (cider-ns-refresh--save-modified-buffers conn)

test/cider-ns-tests.el

@@ -27,6 +27,7 @@
 
 (require 'buttercup)
 (require 'cider-ns)
+(require 'cider-mode) ; for `cider-ns-menu--refresh'
 (require 'cider-test-utils "test/utils/cider-test-utils")
 
 ;; Please, for each `describe', ensure there's an `it' block, so that its execution is visible in CI.
@@ -250,3 +251,18 @@
             :to-equal 'cider-ns-refresh))
   (it "provides a menu (#2798)"
     (expect (lookup-key cider-ns-refresh-log-mode-map [menu-bar]) :to-be-truthy)))
+
+(describe "cider-ns-menu--refresh"
+  (before-each (spy-on 'cider-ns-refresh))
+
+  (it "translates the menu switches into a list of refresh modes"
+    (cider-ns-menu--refresh '("--all" "--inhibit-fns"))
+    (expect 'cider-ns-refresh :to-have-been-called-with '(refresh-all inhibit-fns)))
+
+  (it "passes clear on its own"
+    (cider-ns-menu--refresh '("--clear"))
+    (expect 'cider-ns-refresh :to-have-been-called-with '(clear)))
+
+  (it "passes nil for a plain smart reload when no switches are set"
+    (cider-ns-menu--refresh nil)
+    (expect 'cider-ns-refresh :to-have-been-called-with nil)))