branch: elpa/cider
commit 41840db4776ecc1a966efe2d0fe842b40ddaf095
Author: Eric Dallo <ericdall...@hotmail.com>
Commit: GitHub <nore...@github.com>
[Fixes #3170] Skip ensure of repl available on xref functions (#3171)
---
CHANGELOG.md | 1 +
cider-client.el | 9 ++++++---
cider-find.el | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a245d345c1..1c7c5471f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
### Changes
* Use clojure-mode
[5.14.0](https://github.com/clojure-emacs/clojure-mode/blob/v5.14.0/CHANGELOG.md#5140-2022-03-07).
+* [#3170](https://github.com/clojure-emacs/cider/issues/3170) Skip ensure repl
available on xref functions.
## 1.3.0 (2021-03-07)
diff --git a/cider-client.el b/cider-client.el
index 4fb2ca887d..a523d998e5 100644
--- a/cider-client.el
+++ b/cider-client.el
@@ -161,9 +161,12 @@ nREPL connection."
(clojure-expected-ns path)))
(clojure-expected-ns path)))
-(defun cider-nrepl-op-supported-p (op &optional connection)
- "Check whether the CONNECTION supports the nREPL middleware OP."
- (nrepl-op-supported-p op (or connection (cider-current-repl nil 'ensure))))
+(defun cider-nrepl-op-supported-p (op &optional connection skip-ensure)
+ "Check whether the CONNECTION supports the nREPL middleware OP.
+Skip check if repl is active if SKIP-ENSURE is non nil."
+ (nrepl-op-supported-p op (or connection (cider-current-repl nil (if
skip-ensure
+ nil
+
'ensure)))))
(defun cider-ensure-op-supported (op)
"Check for support of middleware op OP.
diff --git a/cider-find.el b/cider-find.el
index ea43dc11dd..2ff0aa50fa 100644
--- a/cider-find.el
+++ b/cider-find.el
@@ -234,7 +234,7 @@ thing at point."
"Used for xref integration."
;; Check if `cider-nrepl` middleware is loaded. Allows fallback to other xref
;; backends, if cider-nrepl is not loaded.
- (when (cider-nrepl-op-supported-p "ns-path")
+ (when (cider-nrepl-op-supported-p "ns-path" 'skip-ensure)
'cider))
(cl-defmethod xref-backend-identifier-at-point ((_backend (eql cider)))
