[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/eglot e8b9cbf 16/22: Slightly simplify eglot-completion
From: |
João Távora |
Subject: |
[elpa] externals/eglot e8b9cbf 16/22: Slightly simplify eglot-completion-at-point |
Date: |
Sat, 5 Jan 2019 09:31:04 -0500 (EST) |
branch: externals/eglot
commit e8b9cbf617e78daae4656cfa20d8a7c3db32eb33
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Slightly simplify eglot-completion-at-point
* eglot.el (eglot-completion-at-point): Don't propertize
completion string with all LSP properties.
---
eglot.el | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/eglot.el b/eglot.el
index d60fc07..a335f16 100644
--- a/eglot.el
+++ b/eglot.el
@@ -1844,7 +1844,6 @@ is not active."
(string-trim-left label))
(t
(or insertText (string-trim-left label))))))
- (add-text-properties 0 1 all completion)
(put-text-property 0 1 'eglot--lsp-completion all
completion)
completion))
items)))))
@@ -1869,15 +1868,15 @@ is not active."
:company-doc-buffer
(lambda (obj)
(let* ((documentation
- (or (get-text-property 0 :documentation obj)
- (and (eglot--server-capable :completionProvider
- :resolveProvider)
- (plist-get
- (jsonrpc-request server :completionItem/resolve
- (get-text-property
- 0 'eglot--lsp-completion obj)
- :cancel-on-input t)
- :documentation))))
+ (let ((lsp-comp
+ (get-text-property 0 'eglot--lsp-completion obj)))
+ (or (plist-get lsp-comp :documentation)
+ (and (eglot--server-capable :completionProvider
+ :resolveProvider)
+ (plist-get
+ (jsonrpc-request server :completionItem/resolve
+ lsp-comp :cancel-on-input t)
+ :documentation)))))
(formatted (and documentation
(eglot--format-markup documentation))))
(when formatted
- [elpa] externals/eglot updated (23accee -> 35597d2), João Távora, 2019/01/05
- [elpa] externals/eglot cc5ef6c 02/22: Apply eglot--format-markup to signature documentation, João Távora, 2019/01/05
- [elpa] externals/eglot d77b447 04/22: Adjust active param highlighting in first line of signature (2/3), João Távora, 2019/01/05
- [elpa] externals/eglot ef95839 05/22: Adjust active param highlighting in first line of signature (3/3), João Távora, 2019/01/05
- [elpa] externals/eglot 64c7605 03/22: Adjust active param highlighting in first line of signature (1/3), João Távora, 2019/01/05
- [elpa] externals/eglot e8b9cbf 16/22: Slightly simplify eglot-completion-at-point,
João Távora <=
- [elpa] externals/eglot d5521e9 12/22: Remove workaround for company bug that has been fixed, João Távora, 2019/01/05
- [elpa] externals/eglot d167c80 15/22: Fix #190: actually make completion sorting work, João Távora, 2019/01/05
- [elpa] externals/eglot 476feb8 07/22: Add edebug specs to destructuring macros, João Távora, 2019/01/05
- [elpa] externals/eglot b8a8901 09/22: Fix #187: be more careful when making xref summaries, João Távora, 2019/01/05
- [elpa] externals/eglot 2f0e51a 13/22: Per #188: use gfm-view-mode, João Távora, 2019/01/05
- [elpa] externals/eglot b393c48 14/22: Fix previous commit where workaround had been removed, João Távora, 2019/01/05
- [elpa] externals/eglot 64da240 19/22: Fix #196: run connection hooks with proper dir-locals, João Távora, 2019/01/05
- [elpa] externals/eglot af9dcad 10/22: Take over Flymake and Eldoc completely while managing buffers, João Távora, 2019/01/05
- [elpa] externals/eglot 5b9a164 01/22: Per #180: frame lsp-mode.el comparison as historical even more evidently, João Távora, 2019/01/05
- [elpa] externals/eglot 7b0d845 17/22: Close #195: remove a hard dependency on flymake-mode, João Távora, 2019/01/05