Turn do-connections into a function: map-connections

Author: Malabarba

cider-client.el

@@ -226,10 +226,9 @@ from the file extension."
     (car cider-connections)))
 
 (defun cider-other-connection (&optional connection)
-  "Return the first connection of another type than `cider-current-connection', \
-in the same project, or nil.
-
-If CONNECTION is provided act on that connection instead."
+  "Return the first connection of another type than CONNECTION
+Only return connections in the same project or nil.
+CONNECTION defaults to `cider-current-connection'."
   (let* ((connection (or connection (cider-current-connection)))
          (connection-type (cider--connection-type connection))
          (other (if (equal connection-type "clj")
@@ -238,6 +237,17 @@ If CONNECTION is provided act on that connection instead."
     (unless (equal connection-type (cider--connection-type other))
       other)))
 
+(defun cider-map-connections (function)
+  "Call FUNCTION once for each appropriate connection.
+The function is called with one argument, the connection buffer.
+The appropriate connections are found by inspecting the current buffer.  If
+the buffer is associated with a .cljc or .cljx file, BODY will be executed
+multiple times."
+  (if-let ((is-cljc (cider--cljc-or-cljx-buffer-p))
+           (other-connection (cider-other-connection)))
+      (mapc function (list (cider-current-connection) other-connection))
+    (funcall function (cider-current-connection))))
+
 
 ;;; Connection Browser
 (defvar cider-connections-buffer-mode-map

cider-common.el

@@ -224,21 +224,5 @@ existing file ending with URL has been found."
       (16 t) ; empty empty
       (_ nil))))
 
-(defmacro cider-do-connections (var &rest body)
-  "For each appropriate connection, bind it to VAR, and execute BODY.
-
-The appropriate connections are found by inspecting the current buffer.  If
-the buffer is associated with a .cljc or .cljx file, BODY will be executed
-multiple times."
-  (declare (indent 1)
-           (debug (form body)))
-  (let ((other-connection 'oh-my-god-the-linter-wont-let-me-use-gensym))
-    `(if-let ((_ (cider--cljc-or-cljx-buffer-p))
-              (,other-connection (cider-other-connection)))
-         (dolist (,var (list (cider-current-connection) ,other-connection))
-           ,@body)
-       (let ((,var (cider-current-connection)))
-         ,@body))))
-
 (provide 'cider-common)
 ;;; cider-common.el ends here

cider-interaction.el

@@ -1373,12 +1373,13 @@ ClojureScript REPL exists for the project, it is evaluated in both REPLs."
     (cider--quit-error-window)
     (cider--cache-ns-form)
     (let ((filename (buffer-file-name)))
-      (cider-do-connections connection
-        (cider-request:load-file
-         (cider-file-string filename)
-         (funcall cider-to-nrepl-filename-function (cider--server-filename filename))
-         (file-name-nondirectory filename)
-         connection))
+      (cider-map-connections
+       (lambda (connection)
+         (cider-request:load-file (cider-file-string filename)
+                                  (funcall cider-to-nrepl-filename-function
+                                           (cider--server-filename filename))
+                                  (file-name-nondirectory filename)
+                                  connection)))
       (message "Loading %s..." filename))))
 
 (defun cider-load-file (filename)

cider-repl.el

@@ -790,10 +790,10 @@ namespace to switch to."
                        (cider-current-ns))))
   (when (or (not ns) (equal ns ""))
     (user-error "No namespace selected"))
-  (cider-do-connections connection
-    (cider-nrepl-request:eval (format "(in-ns '%s)" ns)
-                              (cider-repl-switch-ns-handler
-                               connection))))
+  (cider-map-connections
+   (lambda (connection)
+     (cider-nrepl-request:eval (format "(in-ns '%s)" ns)
+                               (cider-repl-switch-ns-handler connection)))))
 
 
 ;;;;; History