From f5e3279958eb78c90da8df3a159b931b7a6b3134 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Sat, 22 Dec 2018 15:27:27 +0000 Subject: [PATCH] Fix previous commit where workaround had been removed Do remove the workaround, but not more than that. * eglot.el (eglot-completion-at-point): set local var strings. --- lisp/progmodes/eglot.el | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 43bc023509e..5861b05fcdf 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -1822,19 +1822,21 @@ is not active." :deferred :textDocument/completion :cancel-on-input t)) (items (if (vectorp resp) resp (plist-get resp :items)))) - (mapcar - (jsonrpc-lambda (&rest all &key label insertText insertTextFormat - &allow-other-keys) - (let ((completion - (cond ((and (eql insertTextFormat 2) - (eglot--snippet-expansion-fn)) - (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)))) + (setq + strings + (mapcar + (jsonrpc-lambda (&rest all &key label insertText insertTextFormat + &allow-other-keys) + (let ((completion + (cond ((and (eql insertTextFormat 2) + (eglot--snippet-expansion-fn)) + (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))))) :annotation-function (lambda (obj) (eglot--dbind ((CompletionItem) detail kind insertTextFormat) -- 2.39.2