procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eglot: ensure quick typing doesn't undermine completion exit

Browse source 
Some completion resolution requests in
eglot-completion-at-point, specifically those that might be
triggered from the :exit function, can't be cancellable, else
the completion edit or snippet will never be obtained and the
user is left with the nonsensical completion label in the
buffer.

Github-reference: https://github.com/joaotavora/eglot/issues/1474
This commit is contained in:
João Távora 2024-12-20 23:11:30 +00:00
parent 8aad208e00
commit b71ddaf6d3
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/progmodes/eglot.el
View file

@ -3228,14 +3228,15 @@ for which LSP on-type-formatting should be requested."
;; Maybe completion/resolve JSON object `lsp-comp' into
;; another JSON object, if at all possible. Otherwise,
;; just return lsp-comp.
(lambda (lsp-comp)
(lambda (lsp-comp &optional dont-cancel-on-input)
(or (gethash lsp-comp resolved)
(setf (gethash lsp-comp resolved)
(if (and (eglot-server-capable :completionProvider
:resolveProvider)
(plist-get lsp-comp :data))
(eglot--request server :completionItem/resolve
lsp-comp :cancel-on-input t
lsp-comp :cancel-on-input
(not dont-cancel-on-input)
:immediate t)
lsp-comp))))))
(when (and (consp eglot--capf-session)
@ -3350,7 +3351,12 @@ for which LSP on-type-formatting should be requested."
;; A lookup should fix that (github#148)
(get-text-property
0 'eglot--lsp-item
(cl-find proxy (funcall proxies) :test #'string=))))
(cl-find proxy (funcall proxies) :test #'string=)))
;; Be sure to pass non-nil here since we don't want
;; any quick typing after the soon-to-be-undone
;; insertion to potentially cancel an essential
;; resolution request (github#1474).
'dont-cancel-on-input)
(let ((snippet-fn (and (eql insertTextFormat 2)
(eglot--snippet-expansion-fn))))
(cond (textEdit