branch: externals/eglot
commit a2d9e1894573aec19e2fcf9bcc9934e513e96c77
Author: João Távora <joaotav...@gmail.com>
Commit: João Távora <joaotav...@gmail.com>
Reply more reasonably to server's workspace/applyEdit
* eglot.el (eglot-handle-request): Return non-nil
(eglot--apply-workspace-edit): Signal jsonrpc-error, not error.
---
eglot.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eglot.el b/eglot.el
index caebced529..c3ef543e3d 100644
--- a/eglot.el
+++ b/eglot.el
@@ -2049,6 +2049,7 @@ THINGS are either registrations or unregisterations
(sic)."
(_server (_method (eql workspace/applyEdit)) &key _label edit)
"Handle server request workspace/applyEdit."
(eglot--apply-workspace-edit edit eglot-confirm-server-initiated-edits))
+ `(:applied t))
(cl-defmethod eglot-handle-request
(server (_method (eql workspace/workspaceFolders)))
@@ -3025,7 +3026,7 @@ for which LSP on-type-formatting should be requested."
(unless (y-or-n-p
(format "[eglot] Server wants to edit:\n %s\n Proceed? "
(mapconcat #'identity (mapcar #'car prepared) "\n
")))
- (eglot--error "User cancelled server edit")))
+ (jsonrpc-error "User cancelled server edit")))
(cl-loop for edit in prepared
for (path edits version) = edit
do (with-current-buffer (find-file-noselect path)
