emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/eglot ad076a02fc 1/2: Fix #981: Apply any additionalTex


From: ELPA Syncer
Subject: [elpa] externals/eglot ad076a02fc 1/2: Fix #981: Apply any additionalTextEdits unconditionally
Date: Thu, 7 Jul 2022 07:57:31 -0400 (EDT)

branch: externals/eglot
commit ad076a02fc1b166900bcc6f88c8cb371fa55033f
Author: João Távora <joaotavora@gmail.com>
Commit: João Távora <joaotavora@gmail.com>

    Fix #981: Apply any additionalTextEdits unconditionally
    
    * eglot.el (eglot-completion-at-point): Apply any
    additionalTextEdits unconditionally.
---
 eglot.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eglot.el b/eglot.el
index b058183fb9..eb5b86ed10 100644
--- a/eglot.el
+++ b/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)))))))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]