mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-23 21:13:52 -08:00
Code Issues Projects Releases Wiki Activity

Eglot: advertise cancellation on eglot--request quits

Browse source 
* lisp/progmodes/eglot.el (eglot--request): Pass CANCEL-ON-QUIT
to jsonrpc-request.
This commit is contained in:
João Távora 2026-01-14 09:37:06 +00:00
parent 81b7e8e927
commit ff5bab9552
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lisp/progmodes/eglot.el
View file

@ -1959,21 +1959,22 @@ in project `%s'."
"Like `jsonrpc-request', but for Eglot LSP requests.
Unless IMMEDIATE, send pending changes before making request."
(unless immediate (eglot--signal-textDocument/didChange))
(condition-case oops
(jsonrpc-request
server method params
:timeout timeout
:cancel-on-input
(cond ((and cancel-on-input
eglot-advertise-cancellation)
(lambda (id)
(jsonrpc-notify server '$/cancelRequest `(:id ,id))))
(cancel-on-input))
:cancel-on-input-retval cancel-on-input-retval)
(jsonrpc-error
(let* ((data (cddr oops)) (code (alist-get 'jsonrpc-error-code data)))
(if (zerop code) (eglot--message (alist-get 'jsonrpc-error-message data))
(signal 'jsonrpc-error (cdr oops)))))))
(cl-flet ((cancel (id)
(jsonrpc-notify server '$/cancelRequest `(:id ,id))))
(condition-case oops
(jsonrpc-request server method params
:timeout timeout
:cancel-on-input
(if (and cancel-on-input eglot-advertise-cancellation)
#'cancel
cancel-on-input)
:cancel-on-quit
(and eglot-advertise-cancellation #'cancel)
:cancel-on-input-retval cancel-on-input-retval)
(jsonrpc-error
(let* ((data (cddr oops)) (ec (alist-get 'jsonrpc-error-code data)))
(if (zerop ec) (eglot--message (alist-get 'jsonrpc-error-message data))
(signal 'jsonrpc-error (cdr oops))))))))
(defvar-local eglot--inflight-async-requests nil
"An plist of symbols to lists of JSONRPC ids.