diff --git a/CHANGELOG.md b/CHANGELOG.md index 14fd4a477..2626c7999 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/cider-connection.el b/cider-connection.el index 598de4045..a72e014e5 100644 --- a/cider-connection.el +++ b/cider-connection.el @@ -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) @@ -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 ()