[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/elpa d254f97 082/139: Solve another textDocument/didCha
From: |
João Távora |
Subject: |
[elpa] externals/elpa d254f97 082/139: Solve another textDocument/didChange bug |
Date: |
Mon, 14 May 2018 09:53:40 -0400 (EDT) |
branch: externals/elpa
commit d254f974e1991f3787da5c06a76da33ab1181548
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Solve another textDocument/didChange bug
* eglot.el (eglot--signal-textDocument/didChange): Rework a bit.
(eglot--after-change): Store the actual after-text in the
eglot--recent-after-changes.
---
eglot.el | 99 ++++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 56 insertions(+), 43 deletions(-)
diff --git a/eglot.el b/eglot.el
index 045588d..f6bf010 100644
--- a/eglot.el
+++ b/eglot.el
@@ -1128,52 +1128,65 @@ were deleted/added)"
"Hook onto `after-change-functions'.
Records START, END and PRE-CHANGE-LENGTH locally."
(cl-incf eglot--versioned-identifier)
- (push (list start end pre-change-length) eglot--recent-after-changes))
+ (push (list start end pre-change-length
+ (buffer-substring-no-properties start end))
+ eglot--recent-after-changes))
(defun eglot--signal-textDocument/didChange ()
"Send textDocument/didChange to server."
- (when (and eglot--recent-before-changes
- eglot--recent-after-changes)
- (let* ((proc (eglot--current-process-or-lose))
- (sync-kind (plist-get (eglot--capabilities proc)
:textDocumentSync)))
- (save-restriction
- (widen)
- (unless (or (not sync-kind)
- (eq sync-kind 0))
- (eglot--notify
- proc
- :textDocument/didChange
- (eglot--obj
- :textDocument
- (eglot--current-buffer-VersionedTextDocumentIdentifier)
- :contentChanges
- (if (or (eq sync-kind 1)
- (/= (length eglot--recent-before-changes)
- (length eglot--recent-after-changes)))
- (vector
- (eglot--obj
- :text (buffer-substring-no-properties (point-min)
(point-max))))
- (apply
- #'vector
- (mapcar
- (pcase-lambda (`(,before-start-position
- ,before-end-position
- ,after-start
- ,after-end
- ,len))
- (eglot--obj
- :range
- (eglot--obj
- :start before-start-position
- :end before-end-position)
- :rangeLength len
- :text (buffer-substring-no-properties after-start
after-end)))
- (reverse
- (cl-mapcar 'append
- eglot--recent-before-changes
- eglot--recent-after-changes)))))))))))
- (setq eglot--recent-before-changes nil
- eglot--recent-after-changes nil))
+ (unwind-protect
+ (when (or eglot--recent-before-changes
+ eglot--recent-after-changes)
+ (let* ((proc (eglot--current-process-or-lose))
+ (sync-kind (plist-get (eglot--capabilities proc)
+ :textDocumentSync))
+ (emacs-messup
+ (/= (length eglot--recent-before-changes)
+ (length eglot--recent-after-changes)))
+ (full-sync-p (or (eq sync-kind 1) emacs-messup)))
+ (when emacs-messup
+ (unless (eq sync-kind 1)
+ (eglot--warn "Using full sync because before: %s and after: %s"
+ eglot--recent-before-changes
+ eglot--recent-after-changes)))
+ (save-restriction
+ (widen)
+ (unless (or (not sync-kind)
+ (eq sync-kind 0))
+ (eglot--notify
+ proc
+ :textDocument/didChange
+ (eglot--obj
+ :textDocument
+ (eglot--current-buffer-VersionedTextDocumentIdentifier)
+ :contentChanges
+ (if full-sync-p
+ (vector
+ (eglot--obj
+ :text (buffer-substring-no-properties (point-min)
+ (point-max))))
+ (apply
+ #'vector
+ (mapcar
+ (pcase-lambda (`(,before-start-position
+ ,before-end-position
+ ,_after-start
+ ,_after-end
+ ,len
+ ,after-text))
+ (eglot--obj
+ :range
+ (eglot--obj
+ :start before-start-position
+ :end before-end-position)
+ :rangeLength len
+ :text after-text))
+ (reverse
+ (cl-mapcar 'append
+ eglot--recent-before-changes
+ eglot--recent-after-changes)))))))))))
+ (setq eglot--recent-before-changes nil
+ eglot--recent-after-changes nil)))
(defun eglot--signal-textDocument/didOpen ()
"Send textDocument/didOpen to server."
- [elpa] externals/elpa 2b61a3b 048/139: Delete two useless forward declarations, (continued)
- [elpa] externals/elpa 2b61a3b 048/139: Delete two useless forward declarations, João Távora, 2018/05/14
- [elpa] externals/elpa 7d0bf64 062/139: Workaround RLS's regusal to treat nil as empty json object, João Távora, 2018/05/14
- [elpa] externals/elpa e7ffc31 067/139: Make reported capabilities into its own function, João Távora, 2018/05/14
- [elpa] externals/elpa c2862f4 063/139: Don't auto-reconnect if last attempt lasted less than 3 seconds, João Távora, 2018/05/14
- [elpa] externals/elpa e86f9b4 073/139: New helper eglot--sync-request, João Távora, 2018/05/14
- [elpa] externals/elpa 95187cf 058/139: Connect to LSP server via TCP, João Távora, 2018/05/14
- [elpa] externals/elpa f8bfb7e 064/139: Handle requests from server correctly, João Távora, 2018/05/14
- [elpa] externals/elpa 8160cd4 071/139: Handle dynamic registration in general (but nothing specific yet), João Távora, 2018/05/14
- [elpa] externals/elpa 9ff97a6 079/139: Increase request timeout length to 10 seconds, João Távora, 2018/05/14
- [elpa] externals/elpa 193c57d 075/139: Half-decent xref support, João Távora, 2018/05/14
- [elpa] externals/elpa d254f97 082/139: Solve another textDocument/didChange bug,
João Távora <=
- [elpa] externals/elpa a7ddce6 080/139: Support javascript's javascript-typescript-langserver, João Távora, 2018/05/14
- [elpa] externals/elpa af14364 093/139: Only request stuff that server says it's capable of, João Távora, 2018/05/14
- [elpa] externals/elpa d33a9b5 103/139: Simplify eglot--signal-textDocument/didChange, João Távora, 2018/05/14
- [elpa] externals/elpa 56c2e1d 104/139: Get rid of eglot-mode, João Távora, 2018/05/14
- [elpa] externals/elpa bbc64b4 087/139: Clean up client capabilities, João Távora, 2018/05/14
- [elpa] externals/elpa 23b79e0 111/139: Shorten summary line to appease package-lint.el, João Távora, 2018/05/14
- [elpa] externals/elpa 24466a9 096/139: When killing server, always wait 3 seconds, João Távora, 2018/05/14
- [elpa] externals/elpa 3a6c637 099/139: Support textDocument/rename, João Távora, 2018/05/14
- [elpa] externals/elpa 458bc69 110/139: More correctly setup rust-mode-related autoloads, João Távora, 2018/05/14
- [elpa] externals/elpa 3dcbc30 109/139: Add minimal headers, commentary and autoloads, João Távora, 2018/05/14