From 5df556bb94d4dcd7aedc1dd8d282b553f67f15e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Sun, 23 Dec 2018 14:01:38 +0000 Subject: [PATCH] Slightly simplify eglot-completion-at-point * eglot.el (eglot-completion-at-point): Don't propertize completion string with all LSP properties. --- lisp/progmodes/eglot.el | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index d60fc0776a8..a335f1675eb 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/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 -- 2.39.2