From 22b084d56341673a3354e80a2d6b13a6e7ec35ef Mon Sep 17 00:00:00 2001 From: Benni Schwerdtner Date: Fri, 22 Dec 2023 13:25:55 +0100 Subject: [PATCH 1/6] Add scittle to runtime versions --- CHANGELOG.md | 1 + cider-connection.el | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14fd4a477..c72676459 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ - Introduces Timbre compatibility for [CIDER Log Mode](https://docs.cider.mx/cider/debugging/logging.html). - Fixes JS completions for nested objects. - Bundles other fixes and reliability improvements. +- Fix scittle jack in when using `cider-jack-in-clj` () ## 1.12.0 (2023-11-24) diff --git a/cider-connection.el b/cider-connection.el index 598de4045..1a9f1243c 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 () + "Likewise for scittle. See `cider--nbb-nrepl-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 () From 2bdd50a392625e6b345ec1871fc81f9bfbf0b777 Mon Sep 17 00:00:00 2001 From: Benni Schwerdtner Date: Fri, 22 Dec 2023 13:35:29 +0100 Subject: [PATCH 2/6] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c72676459..99fae683f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ - Fixes JS completions for nested objects. - Bundles other fixes and reliability improvements. - Fix scittle jack in when using `cider-jack-in-clj` () +- [#3600](https://github.com/clojure-emacs/cider/pull/3600) Fix scittle jack in when using `cider-jack-in-clj` ## 1.12.0 (2023-11-24) From 5855d042a5f72988c0e9f693189a618063f1db14 Mon Sep 17 00:00:00 2001 From: Benni Schwerdtner Date: Fri, 19 Jan 2024 13:00:59 +0100 Subject: [PATCH 3/6] Fix docs etc. --- CHANGELOG.md | 2 +- cider-connection.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99fae683f..9099f195b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,7 @@ - Fixes JS completions for nested objects. - Bundles other fixes and reliability improvements. - Fix scittle jack in when using `cider-jack-in-clj` () -- [#3600](https://github.com/clojure-emacs/cider/pull/3600) Fix scittle jack in when using `cider-jack-in-clj` +- [#3600](https://github.com/clojure-emacs/cider/pull/3600): Fix scittle jack in when using `cider-jack-in-clj. ## 1.12.0 (2023-11-24) diff --git a/cider-connection.el b/cider-connection.el index 1a9f1243c..2388d45cf 100644 --- a/cider-connection.el +++ b/cider-connection.el @@ -459,8 +459,8 @@ But helps us know if this is a nbb repl, or not." (nrepl-dict-get nrepl-versions "nbb-nrepl")))) (defun cider--scittle-nrepl-version () - "Likewise for scittle. See `cider--nbb-nrepl-version'." - (with-current-buffer (cider-current-repl) + "Retrieve the underlying connection's scittle version." + (with-current-buffer (cider-current-repl) (when nrepl-versions (nrepl-dict-get nrepl-versions "scittle-nrepl")))) From 4767b703c1b9ea54955ee4df5a584d120715e001 Mon Sep 17 00:00:00 2001 From: Benni Schwerdtner Date: Wed, 28 Feb 2024 17:08:53 +0100 Subject: [PATCH 4/6] Fix indentation --- cider-connection.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cider-connection.el b/cider-connection.el index 2388d45cf..7802c9498 100644 --- a/cider-connection.el +++ b/cider-connection.el @@ -460,9 +460,12 @@ But helps us know if this is a nbb repl, or not." (defun cider--scittle-nrepl-version () "Retrieve the underlying connection's scittle version." - (with-current-buffer (cider-current-repl) + (with-current-buffer + (cider-current-repl) (when nrepl-versions - (nrepl-dict-get nrepl-versions "scittle-nrepl")))) + (nrepl-dict-get + nrepl-versions + "scittle-nrepl")))) (defun cider-runtime () "Return the runtime of the nREPl server." From 5f926d78d56814d40067e52d0dec49f57aa2e1c1 Mon Sep 17 00:00:00 2001 From: Benni Schwerdtner Date: Wed, 28 Feb 2024 17:10:42 +0100 Subject: [PATCH 5/6] Fix changelog entry --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9099f195b..639dc93cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +- [#3600](https://github.com/clojure-emacs/cider/pull/3600): Fix scittle jack in when using `cider-jack-in-clj. + ### New features - [#3622](https://github.com/clojure-emacs/cider/pull/3461): Basic support for using CIDER from [clojure-ts-mode](https://github.com/clojure-emacs/clojure-ts-mode). @@ -38,8 +40,6 @@ - Introduces Timbre compatibility for [CIDER Log Mode](https://docs.cider.mx/cider/debugging/logging.html). - Fixes JS completions for nested objects. - Bundles other fixes and reliability improvements. -- Fix scittle jack in when using `cider-jack-in-clj` () -- [#3600](https://github.com/clojure-emacs/cider/pull/3600): Fix scittle jack in when using `cider-jack-in-clj. ## 1.12.0 (2023-11-24) From 7363eeee473b19a06317f2c53df255443d542064 Mon Sep 17 00:00:00 2001 From: Benni Schwerdtner Date: Fri, 8 Mar 2024 11:00:43 +0100 Subject: [PATCH 6/6] Fix changelog and indentation --- CHANGELOG.md | 8 ++++++-- cider-connection.el | 7 ++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 639dc93cd..2626c7999 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ ## master (unreleased) -- [#3600](https://github.com/clojure-emacs/cider/pull/3600): Fix scittle jack in when using `cider-jack-in-clj. - ### New features - [#3622](https://github.com/clojure-emacs/cider/pull/3461): Basic support for using CIDER from [clojure-ts-mode](https://github.com/clojure-emacs/clojure-ts-mode). @@ -19,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 7802c9498..a72e014e5 100644 --- a/cider-connection.el +++ b/cider-connection.el @@ -460,12 +460,9 @@ But helps us know if this is a nbb repl, or not." (defun cider--scittle-nrepl-version () "Retrieve the underlying connection's scittle version." - (with-current-buffer - (cider-current-repl) + (with-current-buffer (cider-current-repl) (when nrepl-versions - (nrepl-dict-get - nrepl-versions - "scittle-nrepl")))) + (nrepl-dict-get nrepl-versions "scittle-nrepl")))) (defun cider-runtime () "Return the runtime of the nREPl server."