[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)
- [elpa] externals/eglot d6a6de7 03/69: Fix test failure introduced by previous commit, (continued)
- [elpa] externals/eglot d6a6de7 03/69: Fix test failure introduced by previous commit, João Távora, 2019/10/20
- [elpa] externals/eglot e69cca9 06/69: * README.md: Remove funny UTF character., João Távora, 2019/10/20
- [elpa] externals/eglot 9377988 02/69: Per #198: Show large docs in help buffer instead of echo are by default, João Távora, 2019/10/20
- [elpa] externals/eglot e5e5125 04/69: Rename new defcustoms with friendlier names, João Távora, 2019/10/20
- [elpa] externals/eglot cba3987 07/69: README.md: minor cosmetic tweaks, João Távora, 2019/10/20
- [elpa] externals/eglot dc371b8 08/69: Display truncated docstring if too large for echo area, João Távora, 2019/10/20
- [elpa] externals/eglot 17ec29b 14/69: Per #177: consider mode derivation when guessing servers, João Távora, 2019/10/20
- [elpa] externals/eglot fcb8ab6 11/69: Per #121: fix bug introduced by commit fixing this issue, João Távora, 2019/10/20
- [elpa] externals/eglot 5fc7ecc 10/69: Add built-in support for Dart's dart_language_server, João Távora, 2019/10/20
- [elpa] externals/eglot 1671dc4 12/69: Fix #209: protect against null messages from eldoc, João Távora, 2019/10/20
- [elpa] externals/eglot dbf2dd2 20/69: * eglot.el (xref-backend-references): Don't use return-from.,
João Távora <=
- [elpa] externals/eglot 3ecdef1 09/69: Fix #201: handle label offsets in ParameterInformation, João Távora, 2019/10/20
- [elpa] externals/eglot 40a3d8c 16/69: Fix broken python formatting tests, João Távora, 2019/10/20
- [elpa] externals/eglot 1c6c30f 17/69: Disable another test on Travis, João Távora, 2019/10/20
- [elpa] externals/eglot d65d139 15/69: Don't teardown company if started via trigger chars, João Távora, 2019/10/20
- [elpa] externals/eglot 7d6e3cf 21/69: Per #220: unbreak build, João Távora, 2019/10/20
- [elpa] externals/eglot b868ee1 23/69: Fix #260: Only consider Eglot's own diagnostics in eglot-code-actions, João Távora, 2019/10/20
- [elpa] externals/eglot 5f629eb 26/69: Add built-in support for Elixir's elixir-ls (#264), João Távora, 2019/10/20
- [elpa] externals/eglot 356100a 19/69: Fix #220: don't sort xref's by default, João Távora, 2019/10/20
- [elpa] externals/eglot 195c311 22/69: Fix local function call in directory watcher (#255), João Távora, 2019/10/20
- [elpa] externals/eglot 2df3991 13/69: Fix #206: Update README.md, João Távora, 2019/10/20