Skip to content

Add scittle to runtime versions #3600

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

Merged
merged 6 commits into from
Mar 8, 2024
Merged

Add scittle to runtime versions #3600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
22b084d
Add scittle to runtime versions
benjamin-asdf Dec 22, 2023
2bdd50a
Update changelog
benjamin-asdf Dec 22, 2023
5855d04
Fix docs etc.
benjamin-asdf Jan 19, 2024
4767b70
Fix indentation
benjamin-asdf Feb 28, 2024
5f926d7
Fix changelog entry
benjamin-asdf Feb 28, 2024
7363eee
Fix changelog and indentation
benjamin-asdf Mar 8, 2024
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
- Updates [Orchard](https://github.com/clojure-emacs/orchard/blob/v0.23.0/CHANGELOG.md#0230-2024-03-03).
- Updates [Logjam](https://github.com/clojure-emacs/logjam/blob/v0.3.0/CHANGELOG.md#030-2024-03-03).


### Bugs fixed

- [#3600](https://github.com/clojure-emacs/cider/pull/3600): Fix scittle jack in when using `cider-jack-in-clj`.


## 1.13.1 (2024-02-01)

### Bugs fixed
Expand Down
8 changes: 8 additions & 0 deletions cider-connection.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ See `cider-connection-capabilities'."
('clojure '(clojure jvm-compilation-errors))
('babashka '(babashka jvm-compilation-errors))
('nbb '(cljs))
('scittle '(cljs))
(_ '()))
(when
(eq cider-repl-type 'cljs)
Expand Down Expand Up @@ -457,12 +458,19 @@ But helps us know if this is a nbb repl, or not."
(when nrepl-versions
(nrepl-dict-get nrepl-versions "nbb-nrepl"))))

(defun cider--scittle-nrepl-version ()
"Retrieve the underlying connection's scittle version."
(with-current-buffer (cider-current-repl)
(when nrepl-versions
(nrepl-dict-get nrepl-versions "scittle-nrepl"))))

(defun cider-runtime ()
"Return the runtime of the nREPl server."
(cond
((cider--clojure-version) 'clojure)
((cider--babashka-version) 'babashka)
((cider--nbb-nrepl-version) 'nbb)
((cider--scittle-nrepl-version) 'scittle)
(t 'generic)))

(defun cider-runtime-clojure-p ()
Expand Down