Merge pull request #1483 from cap10morgan/v0.10

Backported fixes for a 0.10.1 release

Author: bbatsov

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## master (unreleased)
 
+## 0.10.1 / (unreleased)
+
+### Bugs fixed
+
+* [#1480](https://github.com/clojure-emacs/cider/issues/1480): Fix an error in `cider-restart` caused by not using the REPL's buffer as the current connection when calling `cider-current-connection` from REPL buffer.
+* [#1450](https://github.com/clojure-emacs/cider/pull/1450): Fix an error in `cider-restart` caused by a reference to a killed buffer.
+* [#1459](https://github.com/clojure-emacs/cider/issues/1459): Add support for dynamic dispatch in scratch buffers.
+* [#1466](https://github.com/clojure-emacs/cider/issues/1466): Correctly font-lock pretty-printed results in the REPL.
+* [#1475](https://github.com/clojure-emacs/cider/pull/1475): Fix `args-out-of-range` error in `cider--get-symbol-indent`.
+
 ## 0.10.0 / 2015-12-03
 
 ### New features
@@ -51,7 +61,7 @@
 
 ### Changes
 
-* [#1299]https://github.com/clojure-emacs/cider/issues/1299 <kbd>C-c C-k</kbd> and <kbd> C-c C-l</kbd> now dispatch to both the Clojure and ClojureScript REPL (in the same project) when called from a `.cljc` or `.cljx` file.
+* [#1299](https://github.com/clojure-emacs/cider/issues/1299) <kbd>C-c C-k</kbd> and <kbd> C-c C-l</kbd> now dispatch to both the Clojure and ClojureScript REPL (in the same project) when called from a `.cljc` or `.cljx` file.
 * [#1397](https://github.com/clojure-emacs/cider/issues/1297) <kbd>C-c M-n</kbd> now changes the ns of both the Clojure and ClojureScript REPL (in the same project) when called from a cljc or cljx file.
 * [#1348](https://github.com/clojure-emacs/cider/issues/1348): Drop the dash dependency.
 * The usage of the default connection has been reduced significantly. Now evaluations & related commands will be routed via the connection matching the current project automatically unless there's some ambiguity when determining the connection (like multiple or no matching connections). Simply put you'll no longer have to mess around much with connecting-setting commands (e.g. `nrepl-connection-browser`, `cider-rotate-default-connection`).

cider-client.el

@@ -204,26 +204,28 @@ current directory (see `cider-find-connection-buffer-for-project-directory').
 If there is ambiguity, it is resolved by matching TYPE with the REPL
 type (Clojure or ClojureScript).  TYPE is a string, which when nil is derived
 from the file extension."
-  (cider-connections) ; Cleanup the connections list.
-  (if (eq cider-request-dispatch 'dynamic)
+  ;; if you're in a REPL buffer, it's the connection buffer
+  (if (derived-mode-p 'cider-repl-mode)
+      (current-buffer)
+    (let ((connections (cider-connections)))
       (cond
-       ((and (not type) (cider--in-connection-buffer-p)) (current-buffer))
-       ((= 1 (length cider-connections)) (car cider-connections))
+       ((eq cider-request-dispatch 'static) (car connections))
+       ((= 1 (length connections)) (car connections))
        (t (let ((project-connections
                  (cider-find-connection-buffer-for-project-directory
                   nil :all-connections)))
             (if (= 1 (length project-connections))
                 ;; Only one match, just return it.
                 (car project-connections)
-              ;; OW, find one matching the extension of current file.
-              (let ((type (or type (file-name-extension (or (buffer-file-name) "")))))
+              ;; OW, find one matching the language of the current buffer.
+              (let ((type (or type cider-repl-type
+                              (if (derived-mode-p 'clojurescript-mode)
+                                  "cljs" "clj"))))
                 (or (seq-find (lambda (conn)
                                 (equal (cider--connection-type conn) type))
                               project-connections)
                     (car project-connections)
-                    (car cider-connections)))))))
-    ;; TODO: Add logic to dispatch to a matching Clojure/ClojureScript REPL based on file type
-    (car cider-connections)))
+                    (car connections))))))))))
 
 (defun cider-other-connection (&optional connection)
   "Return the first connection of another type than CONNECTION

cider-interaction.el

@@ -1553,12 +1553,13 @@ and all ancillary CIDER buffers."
 
 (defun cider--restart-connection (conn)
   "Restart the connection CONN."
-  (let ((project-dir (with-current-buffer conn nrepl-project-dir)))
+  (let ((project-dir (with-current-buffer conn nrepl-project-dir))
+        (buf-name (buffer-name conn)))
     (cider--quit-connection conn)
     ;; Workaround for a nasty race condition https://github.com/clojure-emacs/cider/issues/439
     ;; TODO: Find a better way to ensure `cider-quit' has finished
     (message "Waiting for CIDER connection %s to quit..."
-             (cider-propertize-bold (buffer-name conn)))
+             (cider-propertize-bold buf-name))
     (sleep-for 2)
     (if project-dir
         (let ((default-directory project-dir))

cider-mode.el

@@ -289,7 +289,8 @@ Returns to the buffer in which the command was invoked."
       ;; There's no indent metadata, but there might be a clojure-mode
       ;; indent-spec with fully-qualified namespace.
       (when (string-match cider-resolve--prefix-regexp symbol-name)
-        (when-let ((sym (intern-soft (replace-match (cider-resolve-alias ns (match-string 1 symbol-name))
+        (when-let ((sym (intern-soft (replace-match (save-match-data
+                                                      (cider-resolve-alias ns (match-string 1 symbol-name)))
                                                     t t symbol-name 1))))
           (get sym 'clojure-indent-function))))))
 

cider-repl.el

@@ -606,7 +606,10 @@ the symbol."
                                (lambda (buffer err)
                                  (cider-repl-emit-stderr buffer err))
                                (lambda (buffer)
-                                 (cider-repl-emit-prompt buffer))))
+                                 (cider-repl-emit-prompt buffer))
+                               nrepl-err-handler
+                               (lambda (buffer pprint-out)
+                                 (cider-repl-emit-result buffer pprint-out nil))))
 
 (defun cider-repl--send-input (&optional newline)
   "Go to the end of the input and send the current input.

nrepl-client.el

@@ -824,7 +824,8 @@ It is safe to call this function multiple times on the same ID."
 
 (defun nrepl-make-response-handler (buffer value-handler stdout-handler
                                            stderr-handler done-handler
-                                           &optional eval-error-handler)
+                                           &optional eval-error-handler
+                                           pprint-out-handler)
   "Make a response handler for connection BUFFER.
 A handler is a function that takes one argument - response received from
 the server process.  The response is an alist that contains at least 'id'
@@ -855,8 +856,8 @@ server responses."
              (when stdout-handler
                (funcall stdout-handler buffer out)))
             (pprint-out
-             (when stdout-handler
-               (funcall stdout-handler buffer pprint-out)))
+             (cond (pprint-out-handler (funcall pprint-out-handler buffer pprint-out))
+                   (stdout-handler (funcall stdout-handler buffer pprint-out))))
             (err
              (when stderr-handler
                (funcall stderr-handler buffer err)))