From 9ffcd537f82ecb05996c49014c5b72009134a927 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Fri, 24 Jun 2022 10:35:07 +0100 Subject: [PATCH] Apply any additionaltextedits unconditionally * eglot.el (eglot-completion-at-point): Apply any additionalTextEdits unconditionally. GitHub-reference: fix https://github.com/joaotavora/eglot/issues/981 --- lisp/progmodes/eglot.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index b058183fb96..eb5b86ed10b 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -2698,16 +2698,16 @@ for which LSP on-type-formatting should be requested." (eglot--range-region range))) (delete-region beg end) (goto-char beg) - (funcall (or snippet-fn #'insert) newText))) - (when (cl-plusp (length additionalTextEdits)) - (eglot--apply-text-edits additionalTextEdits))) + (funcall (or snippet-fn #'insert) newText)))) (snippet-fn ;; A snippet should be inserted, but using plain ;; `insertText'. This requires us to delete the ;; whole completion, since `insertText' is the full ;; completion's text. (delete-region (- (point) (length proxy)) (point)) - (funcall snippet-fn (or insertText label))))) + (funcall snippet-fn (or insertText label)))) + (when (cl-plusp (length additionalTextEdits)) + (eglot--apply-text-edits additionalTextEdits))) (eglot--signal-textDocument/didChange) (eldoc))))))))) -- 2.39.5