[Fixes clojure-emacs#3170] Skip ensure of repl avaiable on xref funct…

…ions
ericdallo · Mar 24, 2022 · 265eb6d · 265eb6d
1 parent 1e27eba
commit 265eb6d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -161,9 +161,11 @@ nREPL connection."
           (clojure-expected-ns path)))
     (clojure-expected-ns path)))
 
-(defun cider-nrepl-op-supported-p (op &optional connection)
+(defun cider-nrepl-op-supported-p (op &optional connection skip-ensure)
   "Check whether the CONNECTION supports the nREPL middleware OP."
-  (nrepl-op-supported-p op (or connection (cider-current-repl nil 'ensure))))
+  (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
@@ -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)))