[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/eglot 51f5e87 6/8: Fix completionItem/resolve
From: |
João Távora |
Subject: |
[elpa] externals/eglot 51f5e87 6/8: Fix completionItem/resolve |
Date: |
Fri, 1 Jun 2018 12:58:26 -0400 (EDT) |
branch: externals/eglot
commit 51f5e87924bdb1813e1943b5ba87cca741593033
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Fix completionItem/resolve
Should fix interoperation with company-quickhelp.
* eglot.el (eglot-completion-at-point): Correctly pass properties
to completionItem/resolve.
---
eglot.el | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/eglot.el b/eglot.el
index b133ffb..3c84297 100644
--- a/eglot.el
+++ b/eglot.el
@@ -1372,7 +1372,9 @@ DUMMY is ignored"
(mapcar
(eglot--lambda (&rest all &key label insertText &allow-other-keys)
(let ((insert (or insertText label)))
- (add-text-properties 0 1 all insert) insert))
+ (add-text-properties 0 1 all insert)
+ (put-text-property 0 1 'eglot--lsp-completion all insert)
+ insert))
items))))
:annotation-function
(lambda (obj)
@@ -1391,13 +1393,15 @@ DUMMY is ignored"
(or (get-text-property 0 :sortText b) "")))))
:company-doc-buffer
(lambda (obj)
- (let ((documentation
- (or (get-text-property 0 :documentation obj)
- (and (eglot--server-capable :completionProvider
- :resolveProvider)
- (plist-get (eglot--request server
:completionItem/resolve
- (text-properties-at 0 obj))
- :documentation)))))
+ (let* ((documentation
+ (or (get-text-property 0 :documentation obj)
+ (and (eglot--server-capable :completionProvider
+ :resolveProvider)
+ (plist-get
+ (eglot--request server :completionItem/resolve
+ (get-text-property
+ 0 'eglot--lsp-completion obj))
+ :documentation)))))
(when documentation
(with-current-buffer (get-buffer-create " *eglot doc*")
(insert (eglot--format-markup documentation))
- [elpa] externals/eglot updated (4211e0c -> e103d5f), João Távora, 2018/06/01
- [elpa] externals/eglot 5f723ba 1/8: Prevent possible cquery choke on :initializationOptions, João Távora, 2018/06/01
- [elpa] externals/eglot 8f17393 5/8: Explicitly trigger eldoc after workspace edits, João Távora, 2018/06/01
- [elpa] externals/eglot 51f5e87 6/8: Fix completionItem/resolve,
João Távora <=
- [elpa] externals/eglot e0c642e 2/8: Add MELPA badge, João Távora, 2018/06/01
- [elpa] externals/eglot 29c3d76 3/8: Revert an unfinished feature that made it to the last commit, João Távora, 2018/06/01
- [elpa] externals/eglot d6af4df 4/8: New command M-x eglot-code-actions, João Távora, 2018/06/01
- [elpa] externals/eglot e103d5f 8/8: * eglot.el (Version): Bump to 0.8, João Távora, 2018/06/01
- [elpa] externals/eglot 3dbcece 7/8: Add animated gifs to README.md, João Távora, 2018/06/01