Skip to content

Commit

Permalink
Fix: cider-repl-set-ns no longer changes the repl session type from…
Browse files Browse the repository at this point in the history
… `cljs:shadow` to `clj`

Closes #3236
  • Loading branch information
vemv committed Jul 21, 2023
1 parent 74be055 commit f4bf384
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- [#3353](https://github.com/clojure-emacs/cider/issues/3353): Fix regression which caused new connections to prompt for reusing dead REPLs.
- [#3355](https://github.com/clojure-emacs/cider/pull/3355): Fix `cider-mode` disabling itself after a disconnect when `cider-auto-mode` is set to nil.
- [#3362](https://github.com/clojure-emacs/cider/issues/3362): Fix `sesman-restart` regression issue.
- [#3236](https://github.com/clojure-emacs/cider/issues/3236): `cider-repl-set-ns` no longer changes the repl session type from `cljs:shadow` to `clj`.

### Changes

Expand Down
7 changes: 5 additions & 2 deletions cider-repl.el
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,11 @@ This cache is stored in the connection buffer.")
"Handle server state contained in RESPONSE."
(with-demoted-errors "Error in `cider-repl--state-handler': %s"
(when (member "state" (nrepl-dict-get response "status"))
(nrepl-dbind-response response (repl-type changed-namespaces)
(when (and repl-type cider-repl-auto-detect-type)
(nrepl-dbind-response response (repl-type changed-namespaces session)
(when (and repl-type
cider-repl-auto-detect-type
;; tooling sessions always run on the JVM so they are not a valid criterion:
(not (equal session nrepl-tooling-session)))
(cider-set-repl-type repl-type))
(when (eq (cider-maybe-intern repl-type) 'cljs)
(setq cider-repl-cljs-upgrade-pending nil))
Expand Down

0 comments on commit f4bf384

Please sign in to comment.