[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 1.2 0f8091f 082/101: Fix a bug when response to definitions reque
From: |
Christian Johansson |
Subject: |
[elpa] 1.2 0f8091f 082/101: Fix a bug when response to definitions request is a single location |
Date: |
Thu, 29 Apr 2021 15:09:05 -0400 (EDT) |
tag: 1.2
commit 0f8091f05a1337c42f6563833fcfe0c008897024
Author: Michał Krzywkowski <k.michal@zoho.com>
Commit: Michał Krzywkowski <k.michal@zoho.com>
Fix a bug when response to definitions request is a single location
It's valid to return just a single Location for a definitions request.
* eglot.el (xref-backend-definitions): Coerce response to a vector.
---
eglot.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/eglot.el b/eglot.el
index 2b683f8..f11a14e 100644
--- a/eglot.el
+++ b/eglot.el
@@ -1381,17 +1381,20 @@ DUMMY is ignored."
(cl-defmethod xref-backend-definitions ((_backend (eql eglot)) identifier)
(let* ((rich-identifier
(car (member identifier eglot--xref-known-symbols)))
- (location-or-locations
+ (definitions
(if rich-identifier
(get-text-property 0 :locations rich-identifier)
(jsonrpc-request (eglot--current-server-or-lose)
:textDocument/definition
(get-text-property
- 0 :textDocumentPositionParams identifier)))))
+ 0 :textDocumentPositionParams identifier))))
+ (locations
+ (and definitions
+ (if (vectorp definitions) definitions (vector definitions)))))
(eglot--sort-xrefs
(mapcar (jsonrpc-lambda (&key uri range)
(eglot--xref-make identifier uri (plist-get range :start)))
- location-or-locations))))
+ locations))))
(cl-defmethod xref-backend-references ((_backend (eql eglot)) identifier)
(unless (eglot--server-capable :referencesProvider)
- [elpa] 1.2 7e9cc05 098/101: Fix #154: fix potential security issue fontifying LSP doc, (continued)
- [elpa] 1.2 7e9cc05 098/101: Fix #154: fix potential security issue fontifying LSP doc, Christian Johansson, 2021/04/29
- [elpa] 1.2 2bbf06e 097/101: Add support for R's languageserver (#161), Christian Johansson, 2021/04/29
- [elpa] 1.2 c667d79 093/101: Fix #125: add ability to report LSP-compliant columns, Christian Johansson, 2021/04/29
- [elpa] 1.2 a39a446 020/101: Close #61: Snappier completions that don't hinder typing, Christian Johansson, 2021/04/29
- [elpa] 1.2 2e21c12 084/101: * eglot.el (eglot-client-capabilities): Mention supported SymbolKinds., Christian Johansson, 2021/04/29
- [elpa] 1.2 9cee9eb 086/101: Move constants to top instead of forward-declaring, Christian Johansson, 2021/04/29
- [elpa] 1.2 fc9bbf7 096/101: Fix #160: Properly delete inserted text after completion, Christian Johansson, 2021/04/29
- [elpa] 1.2 b573d42 003/101: Close #44: Don't turn on flymake-mode any more than is needed, Christian Johansson, 2021/04/29
- [elpa] 1.2 13d8da4 039/101: Fix textDocument/hover responses where MarkedString is a plist (#72), Christian Johansson, 2021/04/29
- [elpa] 1.2 cf4881c 081/101: Simplify eglot-code-action. Fix compilation warning, Christian Johansson, 2021/04/29
- [elpa] 1.2 0f8091f 082/101: Fix a bug when response to definitions request is a single location,
Christian Johansson <=
- [elpa] 1.2 a81bb01 091/101: Tweak solution to #125 with a hint from Fangrui Song, Christian Johansson, 2021/04/29
- [elpa] 1.2 ba41ed8 099/101: Fix #167: correctly insert TextEdit-less snippets, Christian Johansson, 2021/04/29
- [elpa] 1.2 aa3de04 021/101: Require jsonrpc.el 1.0.2 (GNU ELPA didn't build 1.0.1), Christian Johansson, 2021/04/29
- [elpa] 1.2 7342d88 054/101: Close #115: Don't block kill-buffer-hook if server somehow hangs, Christian Johansson, 2021/04/29
- [elpa] 1.2 985ba0f 062/101: Improve signature help, Christian Johansson, 2021/04/29
- [elpa] 1.2 0509576 042/101: Improve snippet support, Christian Johansson, 2021/04/29
- [elpa] 1.2 97b9c06 065/101: Override eglot-execute-command for eclipse.jdt.ls server, Christian Johansson, 2021/04/29
- [elpa] 1.2 1aeeb45 085/101: Support ocaml-language-server out of the box (#149), Christian Johansson, 2021/04/29
- [elpa] 1.2 e5738ff 094/101: Per #144: Format documentation of signature parameters, Christian Johansson, 2021/04/29
- [elpa] 1.2 e70be91 101/101: * eglot.el (Version): Bump to 1.2, Christian Johansson, 2021/04/29