Skip to content

Commit

Permalink
cider-connect-clj&cljs: don't render `"ClojureScript REPL type:" fo…
Browse files Browse the repository at this point in the history
…r JVM repls (#3389)

Fixes #3383
  • Loading branch information
vemv authored Aug 2, 2023
1 parent be224e3 commit b217386
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- [#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`.
- [#3383](https://github.com/clojure-emacs/cider/issues/3383): `cider-connect-clj&cljs`: don't render `"ClojureScript REPL type:" for JVM repls.

### Changes

Expand Down
12 changes: 8 additions & 4 deletions cider.el
Original file line number Diff line number Diff line change
Expand Up @@ -1448,10 +1448,14 @@ non-nil, don't start if ClojureScript requirements are not met."
(cider--update-host-port)
(cider--check-existing-session)
(cider--update-cljs-type)))
(clj-repl (cider-connect-clj params)))
(if soft-cljs-start
(when (cider--check-cljs (plist-get params :cljs-repl-type) 'no-error)
(cider-connect-sibling-cljs params clj-repl))
(clj-params (thread-first
params
copy-sequence
(map-delete :cljs-repl-type)))
(clj-repl (cider-connect-clj clj-params)))
(when (if soft-cljs-start
(cider--check-cljs (plist-get params :cljs-repl-type) 'no-error)
t)
(cider-connect-sibling-cljs params clj-repl))))

(defvar cider-connection-init-commands
Expand Down

0 comments on commit b217386

Please sign in to comment.