From: João Távora <joaotavora@gmail.com>
Date: Tue, 19 Jul 2022 12:57:52 +0000 (+0100)
Subject: Reply more reasonably to server's workspace/applyedit
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~30
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1986c4df88400a319362c87c616a44d0259f12fe;p=emacs.git

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.
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index caebced5292..c3ef543e3dc 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/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)