emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/eglot dbf2dd2 20/69: * eglot.el (xref-backend-reference


From: João Távora
Subject: [elpa] externals/eglot dbf2dd2 20/69: * eglot.el (xref-backend-references): Don't use return-from.
Date: Sun, 20 Oct 2019 08:21:45 -0400 (EDT)

branch: externals/eglot
commit dbf2dd2bc88d2f64ab24110f787b3289a5783df8
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>

    * eglot.el (xref-backend-references): Don't use return-from.
---
 eglot.el | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/eglot.el b/eglot.el
index 4fdd5c4..df6a1b3 100644
--- a/eglot.el
+++ b/eglot.el
@@ -1767,24 +1767,24 @@ Try to visit the target file for a richer summary line."
              locations))))
 
 (cl-defmethod xref-backend-references ((_backend (eql eglot)) identifier)
-  (unless (eglot--server-capable :referencesProvider)
-    (cl-return-from xref-backend-references nil))
-  (let ((params
-         (or (get-text-property 0 :textDocumentPositionParams identifier)
-             (let ((rich (car (member identifier eglot--xref-known-symbols))))
-               (and rich (get-text-property 0 :textDocumentPositionParams 
rich))))))
-    (unless params
-      (eglot--error "Don' know where %s is in the workspace!" identifier))
-    (eglot--handling-xrefs
-     (mapcar
-      (eglot--lambda ((Location) uri range)
-        (eglot--xref-make identifier uri range))
-      (jsonrpc-request (eglot--current-server-or-lose)
-                       :textDocument/references
-                       (append
-                        params
-                        (list :context
-                              (list :includeDeclaration t))))))))
+  (when (eglot--server-capable :referencesProvider)
+    (let ((params
+           (or (get-text-property 0 :textDocumentPositionParams identifier)
+            (let ((rich (car (member identifier eglot--xref-known-symbols))))
+              (and rich
+                   (get-text-property 0 :textDocumentPositionParams rich))))))
+      (unless params
+        (eglot--error "Don' know where %s is in the workspace!" identifier))
+      (eglot--handling-xrefs
+       (mapcar
+        (eglot--lambda ((Location) uri range)
+          (eglot--xref-make identifier uri range))
+        (jsonrpc-request (eglot--current-server-or-lose)
+                         :textDocument/references
+                         (append
+                          params
+                          (list :context
+                                (list :includeDeclaration t)))))))))
 
 (cl-defmethod xref-backend-apropos ((_backend (eql eglot)) pattern)
   (when (eglot--server-capable :workspaceSymbolProvider)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]