Use plist to cache ns->ns-form mappings

Author: vspinu

cider-client.el

@@ -596,6 +596,11 @@ EVAL-BUFFER is the buffer where the spinner was started."
   "Check if FORM is an ns form."
   (string-match-p "^[[:space:]]*\(ns\\([[:space:]]*$\\|[[:space:]]+\\)" form))
 
+(defun cider-ns-from-form (ns-form)
+  "Get ns substring from NS-FORM."
+  (when (string-match "^[ \t\n]*\(ns[ \t\n]+\\([^][ \t\n(){}]+\\)" ns-form)
+    (match-string-no-properties 1 ns-form)))
+
 (defvar-local cider-buffer-ns nil
   "Current Clojure namespace of some buffer.
 

cider-interaction.el

@@ -1065,9 +1065,6 @@ evaluation command.  Honor `cider-auto-jump-to-error'."
       #'identity))
   "Function to translate Emacs filenames to nREPL namestrings.")
 
-(defvar-local cider--last-ns-form nil
-  "Ns-form of the most recent interactive evaluation.")
-
 (defun cider--prep-interactive-eval (form connection)
   "Prepare the environment for an interactive eval of FORM in CONNECTION.
 Ensure the current ns declaration has been evaluated (so that the ns
@@ -1078,19 +1075,16 @@ window."
   (cider--quit-error-window)
   (let ((cur-ns-form (cider-ns-form)))
     (when (and cur-ns-form
-               (not (string= cur-ns-form
-                             (buffer-local-value 'cider--last-ns-form connection)))
-               (not (cider-ns-form-p form)))
-      (cider-repl--cache-ns-roots cur-ns-form connection)
+               (not (cider-ns-form-p form))
+               (cider-repl--ns-form-changed-p cur-ns-form connection))
       (when cider-auto-track-ns-form-changes
         ;; The first interactive eval on a file can load a lot of libs. This can
         ;; easily lead to more than 10 sec.
         (let ((nrepl-sync-request-timeout 30))
           ;; TODO: check for evaluation errors
           (cider-nrepl-sync-request:eval cur-ns-form connection)))
       ;; cache at the end, in case of errors
-      (with-current-buffer connection
-        (setq cider--last-ns-form cur-ns-form)))))
+      (cider-repl--cache-ns-form cur-ns-form connection))))
 
 (defvar-local cider-interactive-eval-override nil
   "Function to call instead of `cider-interactive-eval'.")
@@ -1611,9 +1605,7 @@ ClojureScript REPL exists for the project, it is evaluated in both REPLs."
           (ns-form  (cider-ns-form)))
       (cider-map-connections
        (lambda (connection)
-         (with-current-buffer connection
-           (setq cider--last-ns-form ns-form))
-         (cider-repl--cache-ns-roots ns-form connection)
+         (cider-repl--cache-ns-form ns-form connection)
          (cider-request:load-file (cider-file-string filename)
                                   (funcall cider-to-nrepl-filename-function
                                            (cider--server-filename filename))

cider-repl.el

@@ -550,7 +550,18 @@ When there is a possible unfinished ansi control sequence,
     (insert-before-markers (cadr ansi-color-context))
     (setq ansi-color-context nil)))
 
-(defvar cider-repl--root-ns-highlitht-template "\\<\\(%s\\)[^$/: \t\n]+"
+(defvar-local cider-repl--ns-forms-plist nil
+  "Plist holding ns->ns-form mappings within each connection.")
+
+(defun cider-repl--ns-form-changed-p (ns-form connection)
+  "Return non-nil if NS-FORM for CONNECTION changed since last eval."
+  (when-let ((ns (cider-ns-from-form ns-form)))
+    (not (string= ns-form
+                  (lax-plist-get
+                   (buffer-local-value 'cider-repl--ns-forms-plist connection)
+                   ns)))))
+
+(defvar cider-repl--root-ns-highlight-template "\\<\\(%s\\)[^$/: \t\n]+"
   "Regexp used to highlight root ns in REPL buffers.")
 
 (defvar-local cider-repl--root-ns-regexp nil
@@ -559,19 +570,24 @@ When there is a possible unfinished ansi control sequence,
 (defvar-local cider-repl--ns-roots nil
   "List holding all past root namespaces seen during interactive eval.")
 
-(defun cider-repl--cache-ns-roots (ns-form connection)
+(defun cider-repl--cache-ns-form (ns-form connection)
   "Given NS-FORM cache root ns in CONNECTION."
   (with-current-buffer connection
-    (when (string-match "^[ \t\n]*\(ns[ \t\n]+\\([^. \t\n]+\\)" ns-form)
-      (let ((root (match-string-no-properties 1 ns-form)))
-        (unless (member root cider-repl--ns-roots)
-          (push root cider-repl--ns-roots)
-          (let ((roots (mapconcat
-                        ;; Replace _ or - with regexp patter to accommodate "raw" namespaces
-                        (lambda (r) (replace-regexp-in-string "[_-]+" "[_-]+" r))
-                        cider-repl--ns-roots "\\|")))
-            (setq cider-repl--root-ns-regexp
-                  (format cider-repl--root-ns-highlitht-template roots))))))))
+    (when-let ((ns (cider-ns-from-form ns-form)))
+      ;; cache ns-form
+      (setq cider-repl--ns-forms-plist
+            (lax-plist-put cider-repl--ns-forms-plist ns ns-form))
+      ;; cache ns roots regexp
+      (when (string-match "\\([^.]+\\)" ns)
+        (let ((root (match-string-no-properties 1 ns)))
+          (unless (member root cider-repl--ns-roots)
+            (push root cider-repl--ns-roots)
+            (let ((roots (mapconcat
+                          ;; Replace _ or - with regexp patter to accommodate "raw" namespaces
+                          (lambda (r) (replace-regexp-in-string "[_-]+" "[_-]+" r))
+                          cider-repl--ns-roots "\\|")))
+              (setq cider-repl--root-ns-regexp
+                    (format cider-repl--root-ns-highlight-template roots)))))))))
 
 (defun cider-repl--apply-current-project-color (string)
   "Fontify project's root namespace to make stacktraces more readable.