Skip to content

Commit a48af15

Browse files
committed
Update to nrepl 0.6.0 / cider-nrepl 0.21.0
1 parent f4441e7 commit a48af15

File tree

7 files changed

+20
-12
lines changed

7 files changed

+20
-12
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,17 @@
44

55
### New features
66

7+
* The `cider-test-run-*` and `cider-ns-refresh-*` commands are now interruptible with the `cider-interrupt` command.
8+
79
### Changes
10+
811
* [#2546](https://github.com/clojure-emacs/cider/pull/2546): New defcustom `cider-ns-save-files-on-refresh-modes` to control for which buffers `cider-ns-refresh` should save before refreshing.
12+
* **(Breaking)** Upgrade to nREPL 0.6.0. This is now the minimum required version.
13+
* **(Breaking)** Upgrade to piggieback 0.4.0. This is now the minimum required version.
14+
* **(Breaking)** Remove `cider.nrepl.middleware.pprint`. All functionality has been replaced by the built-in printing support in nREPL 0.6.
915

1016
### Bug fixes
17+
1118
* Fix values for `cider-preferred-build-tool` variable.
1219
* Fix value and safe property for `cider-allow-jack-in-without-project` variable.
1320
* `cider-ns-save-files-on-refresh` will now save any modified buffers visiting files on the classpath, rather than just in the current project.

cider-client.el

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,9 @@ result, and is included in the request if non-nil."
281281
(let* ((print-options (or cider-pprint-options (nrepl-dict))))
282282
(when right-margin
283283
(setq print-options (nrepl-dict-put print-options (cider--pprint-option "right-margin" cider-pprint-fn) right-margin)))
284-
(nconc `("printer" ,(or pprint-fn (cider--pprint-fn)))
285-
(and (not (nrepl-dict-empty-p print-options)) `("print-options" ,print-options)))))
284+
(append `("nrepl.middleware.print/print" ,(or pprint-fn (cider--pprint-fn))
285+
"nrepl.middleware.print/stream?" "1")
286+
(and (not (nrepl-dict-empty-p print-options)) `("nrepl.middleware.print/options" ,print-options)))))
286287

287288
(defun cider--nrepl-content-type-plist ()
288289
"Plist to be appended to an eval request to make it use content-types."

cider-eval.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,9 @@ into a new error buffer."
278278
(cider-nrepl-send-request
279279
(nconc '("op" "stacktrace")
280280
(when (cider--pprint-fn)
281-
`("pprint-fn" ,(cider--pprint-fn)))
281+
`("nrepl.middleware.print/print" ,(cider--pprint-fn)))
282282
(when cider-stacktrace-print-options
283-
`("print-options" ,cider-stacktrace-print-options)))
283+
`("nrepl.middleware.print/options" ,cider-stacktrace-print-options)))
284284
(lambda (response)
285285
;; While the return value of `cider--handle-stacktrace-response' is not
286286
;; meaningful for the last message, we do not need the value of `causes'

cider-ns.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@ refresh functions (defined in `cider-ns-refresh-before-fn' and
258258
(cider-nrepl-send-request
259259
(nconc `("op" ,(if refresh-all? "refresh-all" "refresh"))
260260
(when (cider--pprint-fn)
261-
`("pprint-fn" ,(cider--pprint-fn)))
261+
`("nrepl.middleware.print/print" ,(cider--pprint-fn)))
262262
(when cider-stacktrace-print-options
263-
`("print-options" ,cider-stacktrace-print-options))
263+
`("nrepl.middleware.print/options" ,cider-stacktrace-print-options))
264264
(when (and (not inhibit-refresh-fns) cider-ns-refresh-before-fn)
265265
`("before" ,cider-ns-refresh-before-fn))
266266
(when (and (not inhibit-refresh-fns) cider-ns-refresh-after-fn)

cider-repl.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ nREPL ops, it may be convenient to prevent inserting a prompt.")
872872
(nrepl-make-response-handler
873873
buffer
874874
(lambda (buffer value)
875-
(cider-repl-emit-result buffer value (not after-first-result-chunk) t)
875+
(cider-repl-emit-result buffer value (not after-first-result-chunk))
876876
(setq after-first-result-chunk t))
877877
(lambda (buffer out)
878878
(cider-repl-emit-stdout buffer out))

cider-test.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,9 @@ prompt and whether to use a new window. Similar to `cider-find-var'."
283283
"var" ,var
284284
"index" ,index)
285285
(when (cider--pprint-fn)
286-
`("pprint-fn" ,(cider--pprint-fn)))
286+
`("nrepl.middleware.print/print" ,(cider--pprint-fn)))
287287
(when cider-stacktrace-print-options
288-
`("print-options" ,cider-stacktrace-print-options)))
288+
`("nrepl.middleware.print/options" ,cider-stacktrace-print-options)))
289289
(lambda (response)
290290
(nrepl-dbind-response response (class status)
291291
(cond (class (setq causes (cons response causes)))

cider.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ Throws an error if PROJECT-TYPE is unknown."
377377
;; We inject the newest known version of nREPL just in case
378378
;; your version of Boot or Leiningen is bundling an older one.
379379
(cider-add-to-alist 'cider-jack-in-dependencies
380-
"nrepl" "0.5.3")
380+
"nrepl" "0.6.0")
381381

382382
(defvar cider-jack-in-cljs-dependencies nil
383383
"List of dependencies where elements are lists of artifact name and version.
@@ -399,10 +399,10 @@ Elements of the list are artifact name and list of exclusions to apply for the a
399399
(defconst cider-latest-clojure-version "1.10.0"
400400
"Latest supported version of Clojure.")
401401

402-
(defconst cider-required-middleware-version "0.20.0"
402+
(defconst cider-required-middleware-version "0.21.0"
403403
"The minimum CIDER nREPL version that's known to work properly with CIDER.")
404404

405-
(defconst cider-latest-middleware-version "0.20.0"
405+
(defconst cider-latest-middleware-version "0.21.0"
406406
"The latest CIDER nREPL version that's known to work properly with CIDER.")
407407

408408
(defcustom cider-jack-in-auto-inject-clojure nil

0 commit comments

Comments
 (0)