Merge pull request #2127 from vspinu/switch

Switch to REPL of correct dialect

Author: bbatsov

CHANGELOG.md

@@ -10,13 +10,15 @@
 
 ### Changes
 
+* `cider-switch-to-last-clojure-buffer` switches to most recent relevant Clojure(script) buffer instead of the last "remembered" buffer. 
 * [cider-nrepl#438](https://github.com/clojure-emacs/cider-nrepl/pull/438): Improve startup time by deferring loading CIDER's middleware until the first usage.
 * [#2078](https://github.com/clojure-emacs/cider/pull/2078): Improve startup time by bundling together sync requests during startup.
 * `cider-rotate-default-connection` will warn if you use it with only a single active connection.
 * `cider-format-buffer` tries to preserve the point position.
 
 ### Bugs Fixed
 
+* [#2084](https://github.com/clojure-emacs/cider/issues/2084): Select correct REPL type (clj or cljs) in cider-switch-to-repl-buffer conditional on the current buffer.
 * [#2088](https://github.com/clojure-emacs/cider/issues/2088): Fix functions defined with `def` being font-locked as vars instead of functions.
 * [#1651](https://github.com/clojure-emacs/cider/issues/1651), [cider-nrepl#445](https://github.com/clojure-emacs/cider-nrepl/pull/455): Fix `cider-expected-ns` returns `nil` on boot projects.
 * [#2120](https://github.com/clojure-emacs/cider/issues/2120): Fix Travis CI build errors for emacs versions >25.2.

cider-client.el

@@ -178,17 +178,19 @@ connections are returned, instead of just the most recent."
             cider-connections
           (car cider-connections)))))
 
-(defun cider-connection-type-for-buffer ()
-  "Return the matching connection type (clj or cljs) for the current buffer.
+(defun cider-connection-type-for-buffer (&optional buffer)
+  "Return the matching connection type (clj or cljs) for BUFFER.
 In cljc and cljx buffers return \"multi\". This function infers connection
 type based on the major mode. See `cider-project-connections-types' for a
-list of types of actual connections within a project."
-  (cond
-   ((derived-mode-p 'clojurescript-mode) "cljs")
-   ((derived-mode-p 'clojurec-mode) "multi")
-   ((derived-mode-p 'clojurex-mode) "multi")
-   ((derived-mode-p 'clojure-mode) "clj")
-   (cider-repl-type)))
+list of types of actual connections within a project.  BUFFER defaults to
+the `current-buffer'."
+  (with-current-buffer (or buffer (current-buffer))
+    (cond
+     ((derived-mode-p 'clojurescript-mode) "cljs")
+     ((derived-mode-p 'clojurec-mode) "multi")
+     ((derived-mode-p 'clojurex-mode) "multi")
+     ((derived-mode-p 'clojure-mode) "clj")
+     (cider-repl-type))))
 
 (defun cider-project-connections-types ()
   "Return a list of types of connections within current project."

cider-mode.el

@@ -83,21 +83,6 @@ entirely."
 
 
 ;;; Switching between REPL & source buffers
-(defvar-local cider-last-clojure-buffer nil
-  "A buffer-local variable holding the last Clojure source buffer.
-`cider-switch-to-last-clojure-buffer' uses this variable to jump
-back to last Clojure source buffer.")
-
-(defun cider-remember-clojure-buffer (buffer)
-  "Try to remember the BUFFER from which the user jumps.
-The BUFFER needs to be a Clojure buffer and current major mode needs
-to be `cider-repl-mode'.  The user can use `cider-switch-to-last-clojure-buffer'
-to jump back to the last Clojure source buffer."
-  (when (and buffer
-             (with-current-buffer buffer
-               (derived-mode-p 'clojure-mode))
-             (derived-mode-p 'cider-repl-mode))
-    (setq cider-last-clojure-buffer buffer)))
 
 (defun cider--switch-to-repl-buffer (repl-buffer &optional set-namespace)
   "Select the REPL-BUFFER, when possible in an existing window.
@@ -117,7 +102,6 @@ that of the namespace in the Clojure source buffer."
     ;; then if necessary we update its namespace
     (when set-namespace
       (cider-repl-set-ns (with-current-buffer buffer (cider-current-ns))))
-    (cider-remember-clojure-buffer buffer)
     (goto-char (point-max))))
 
 (defun cider-switch-to-repl-buffer (&optional set-namespace)
@@ -138,9 +122,17 @@ With a prefix arg SET-NAMESPACE sets the namespace in the REPL buffer to that
 of the namespace in the Clojure source buffer."
   (interactive "P")
   (let* ((connections (cider-connections))
-         (buffer (seq-find (lambda (b) (member b connections))
-                           (buffer-list))))
-    (cider--switch-to-repl-buffer buffer set-namespace)))
+         (type (cider-connection-type-for-buffer))
+         (a-repl)
+         (the-repl (seq-find (lambda (b)
+                               (when (member b connections)
+                                 (unless a-repl
+                                   (setq a-repl b))
+                                 (equal type (cider-connection-type-for-buffer b))))
+                             (buffer-list))))
+    (if-let ((repl (or the-repl a-repl)))
+        (cider--switch-to-repl-buffer repl set-namespace)
+      (user-error "No REPL found"))))
 
 (declare-function cider-load-buffer "cider-interaction")
 
@@ -159,12 +151,23 @@ the same as `cider-switch-to-repl-buffer',
 so that it is very convenient to jump between a
 Clojure buffer and the REPL buffer."
   (interactive)
-  (if (and (derived-mode-p 'cider-repl-mode)
-           (buffer-live-p cider-last-clojure-buffer))
-      (if cider-repl-display-in-current-window
-          (pop-to-buffer-same-window cider-last-clojure-buffer)
-        (pop-to-buffer cider-last-clojure-buffer))
-    (message "Don't know the original Clojure buffer")))
+  (if (derived-mode-p 'cider-repl-mode)
+      (let* ((a-buf)
+             (the-buf (let ((repl-type (cider-connection-type-for-buffer)))
+                        (seq-find (lambda (b)
+                                    (unless (with-current-buffer b (derived-mode-p 'cider-repl-mode))
+                                      (when-let ((type (cider-connection-type-for-buffer b)))
+                                        (unless a-buf
+                                          (setq a-buf b))
+                                        (or (equal type "multi")
+                                            (equal type repl-type)))))
+                                  (buffer-list)))))
+        (if-let ((buf (or the-buf a-buf)))
+            (if cider-repl-display-in-current-window
+                (pop-to-buffer-same-window buf)
+              (pop-to-buffer buf))
+          (user-error "No Clojure buffer found")))
+    (user-error "Not in a CIDER REPL buffer")))
 
 (defun cider-find-and-clear-repl-output (&optional clear-repl)
   "Find the current REPL buffer and clear it.

cider-repl.el

@@ -274,23 +274,15 @@ efficiency."
         (cider-set-buffer-ns initial-ns)))))
 
 (defun cider-repl-require-repl-utils ()
- "Require standard REPL util functions into the current REPL."
- (interactive)
- (nrepl-send-sync-request
-  (lax-plist-put
-   (nrepl--eval-request
-    "(when (clojure.core/resolve 'clojure.main/repl-requires)
+  "Require standard REPL util functions into the current REPL."
+  (interactive)
+  (nrepl-send-sync-request
+   (lax-plist-put
+    (nrepl--eval-request
+     "(when (clojure.core/resolve 'clojure.main/repl-requires)
        (clojure.core/map clojure.core/require clojure.main/repl-requires))")
-   "inhibit-cider-middleware" "true")
-  (cider-current-connection)))
-
-(defvar cider-current-clojure-buffer nil
-  "This variable holds current buffer temporarily when connecting to a REPL.
-It is set to current buffer when `cider' or `cider-jack-in' is called.
-After the REPL buffer is created, the value of this variable is used
-to call `cider-remember-clojure-buffer'.")
-
-(declare-function cider-remember-clojure-buffer "cider-mode")
+    "inhibit-cider-middleware" "true")
+   (cider-current-connection)))
 
 (defun cider-repl-init (buffer &optional no-banner)
   "Initialize the REPL in BUFFER.
@@ -305,7 +297,6 @@ client process connection.  Unless NO-BANNER is non-nil, insert a banner."
   (cider-repl-require-repl-utils)
   (unless no-banner
     (cider-repl--insert-banner-and-prompt buffer))
-  (cider-remember-clojure-buffer cider-current-clojure-buffer)
   buffer)
 
 (defun cider-repl--insert-banner-and-prompt (buffer)

cider.el

@@ -604,7 +604,6 @@ start the server.
 If CLJS-TOO is non-nil, also start a ClojureScript REPL session with its
 own buffer."
   (interactive "P")
-  (setq cider-current-clojure-buffer (current-buffer))
   (let* ((project-type (cider-project-type))
          (command (cider-jack-in-command project-type))
          (command-resolved (cider-jack-in-resolve-command project-type))
@@ -657,7 +656,6 @@ Create REPL buffer and start an nREPL client connection.
 When the optional param PROJECT-DIR is present, the connection
 gets associated with it."
   (interactive (cider-select-endpoint))
-  (setq cider-current-clojure-buffer (current-buffer))
   (when-let* ((repl-buff (cider-find-reusable-repl-buffer `(,host ,port) nil)))
     (let* ((nrepl-create-client-buffer-function  #'cider-repl-create)
            (nrepl-use-this-as-repl-buffer repl-buff)