Add undef-all option when loading files/buffers

Author: yuhan0

cider-eval.el

@@ -1329,12 +1329,15 @@ buffer, else display in a popup buffer."
       (cider-pprint-eval-defun-to-comment)
     (cider--pprint-eval-form (cider-defun-at-point 'bounds))))
 
-(defun cider-eval-ns-form ()
-  "Evaluate the current buffer's namespace form."
-  (interactive)
+(defun cider-eval-ns-form (&optional undef-all)
+  "Evaluate the current buffer's namespace form.
+When UNDEF-ALL is non-nil, unmap all symbols and aliases first."
+  (interactive "p")
   (when (clojure-find-ns)
     (save-excursion
       (goto-char (match-beginning 0))
+      (when undef-all
+        (cider-undef-all (match-string 0)))
       (cider-eval-defun-at-point))))
 
 (defun cider-read-and-eval (&optional value)
@@ -1431,13 +1434,15 @@ passing arguments."
       (widen)
       (substring-no-properties (buffer-string)))))
 
-(defun cider-load-buffer (&optional buffer callback)
+(defun cider-load-buffer (&optional buffer callback undef-all)
   "Load (eval) BUFFER's file in nREPL.
 If no buffer is provided the command acts on the current buffer.  If the
 buffer is for a cljc file, and both a Clojure and ClojureScript REPL exists
 for the project, it is evaluated in both REPLs.
-Optional argument CALLBACK will override the default ‘cider-load-file-handler’."
-  (interactive)
+Optional argument CALLBACK will override the default ‘cider-load-file-handler’.
+When UNDEF-ALL is non-nil or called with \\[universal-argument], removes
+all ns aliases and var mappings from the namespace before reloading it."
+  (interactive (list (current-buffer) nil (equal current-prefix-arg '(4))))
   (setq buffer (or buffer (current-buffer)))
   ;; When cider-load-buffer or cider-load-file are called in programs the
   ;; current context might not match the buffer's context. We use the caller
@@ -1455,6 +1460,8 @@ Optional argument CALLBACK will override the default ‘cider-load-file-handler
                        (y-or-n-p (format "Save file %s? " buffer-file-name))))
           (save-buffer))
         (remove-overlays nil nil 'cider-temporary t)
+        (when undef-all
+          (cider-undef-all (cider-current-ns)))
         (cider--clear-compilation-highlights)
         (cider--quit-error-window)
         (let ((filename (buffer-file-name buffer))
@@ -1471,25 +1478,30 @@ Optional argument CALLBACK will override the default ‘cider-load-file-handler
                                        callback)))
           (message "Loading %s..." filename))))))
 
-(defun cider-load-file (filename)
+(defun cider-load-file (filename &optional undef-all)
   "Load (eval) the Clojure file FILENAME in nREPL.
 If the file is a cljc file, and both a Clojure and ClojureScript REPL
 exists for the project, it is evaluated in both REPLs.  The heavy lifting
-is done by `cider-load-buffer'."
+is done by `cider-load-buffer'.
+When UNDEF-ALL is non-nil or called with \\[universal-argument], removes
+all ns aliases and var mappings from the namespace before reloading it."
   (interactive (list
                 (read-file-name "Load file: " nil nil nil
                                 (when (buffer-file-name)
                                   (file-name-nondirectory
-                                   (buffer-file-name))))))
+                                   (buffer-file-name))))
+                (equal current-prefix-arg '(4))))
   (if-let* ((buffer (find-buffer-visiting filename)))
-      (cider-load-buffer buffer)
-    (cider-load-buffer (find-file-noselect filename))))
+      (cider-load-buffer buffer nil undef-all)
+    (cider-load-buffer (find-file-noselect filename) nil undef-all)))
 
-(defun cider-load-all-files (directory)
+(defun cider-load-all-files (directory undef-all)
   "Load all files in DIRECTORY (recursively).
-Useful when the running nREPL on remote host."
-  (interactive "DLoad files beneath directory: ")
-  (mapcar #'cider-load-file
+Useful when the running nREPL on remote host.
+When UNDEF-ALL is non-nil or called with \\[universal-argument], removes
+all ns aliases and var mappings from the namespaces being reloaded"
+  (interactive "DLoad files beneath directory: \nP")
+  (mapcar (lambda (file) (cider-load-file file undef-all))
           (directory-files-recursively directory "\\.clj[cs]?$")))
 
 (defalias 'cider-eval-file #'cider-load-file