Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cider-connect-clj&cljs: don't render `"ClojureScript REPL type:" for JVM repls #3389

Merged
merged 2 commits into from
Aug 2, 2023
Merged

cider-connect-clj&cljs: don't render `"ClojureScript REPL type:" for JVM repls #3389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4678c4
`cider-connect-clj&cljs`: don't render `"ClojureScript REPL type:" fo…
vemv Aug 1, 2023
7461684
PR feedback
vemv Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,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
View file
Open in desktop
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
Loading