mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 07:41:28 -08:00
Code Issues Projects Releases Wiki Activity

track-changes.el: Add a workaround for bug#70541

Browse source 
* lisp/emacs-lisp/track-changes.el (track-changes-inconsistent-state-p):
 New function.
* lisp/progmodes/eglot.el (eglot--track-changes-signal): Use it.
This commit is contained in:
Stefan Monnier 2024-05-03 13:23:00 -04:00
parent 15c77f2fce
commit b6d4e81a48
2 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/emacs-lisp/track-changes.el
View file

@ -367,6 +367,17 @@ and re-enable the TRACKER corresponding to ID."
;; as to avoid nested invocations. ;; as to avoid nested invocations.
(cl-pushnew id track-changes--clean-trackers)))) (cl-pushnew id track-changes--clean-trackers))))
(defun track-changes-inconsistent-state-p ()
"Return whether the current buffer is in an inconsistent state.
Ideally `before/after-change-functions' should be called for each and every
buffer change, but some packages make transient changes without
running those hooks.
This function tries to detect those situations so clients can decide
to postpone their work to a later time when the buffer is hopefully
returned to a consistent state."
(or (equal track-changes--buffer-size (buffer-size))
inhibit-modification-hooks))
;;;; Auxiliary functions. ;;;; Auxiliary functions.
(defun track-changes--clean-state () (defun track-changes--clean-state ()

28
lisp/progmodes/eglot.el
View file

@ -2694,14 +2694,26 @@ Records BEG, END and PRE-CHANGE-LENGTH locally."
;; who check it as a boolean. ;; who check it as a boolean.
(t (setq eglot--recent-changes :pending))) (t (setq eglot--recent-changes :pending)))
(when eglot--change-idle-timer (cancel-timer eglot--change-idle-timer)) (when eglot--change-idle-timer (cancel-timer eglot--change-idle-timer))
(let ((buf (current-buffer))) (setq eglot--change-idle-timer
(setq eglot--change-idle-timer (run-with-idle-timer
(run-with-idle-timer eglot-send-changes-idle-time nil
eglot-send-changes-idle-time (lambda (buf)
nil (lambda () (eglot--when-live-buffer buf (eglot--when-live-buffer buf
(when eglot--managed-mode (when eglot--managed-mode
(run-hooks 'eglot--document-changed-hook) (if (and (fboundp 'track-changes-inconsistent-state-p)
(setq eglot--change-idle-timer nil)))))))) (track-changes-inconsistent-state-p))
;; Not a good time (e.g. in the middle of Quail
;; thingy, bug#70541), let's reschedule.
;; Ideally, we'd `run-with-idle-timer' to call
;; ourselves again but it's kind of a pain to do that
;; right (because we first have to wait for the
;; current idle period to end), so we just do
;; nothing and wait for the next buffer change to
;; reschedule us.
nil
(run-hooks 'eglot--document-changed-hook)
(setq eglot--change-idle-timer nil))))
(current-buffer)))))
(defvar-local eglot-workspace-configuration () (defvar-local eglot-workspace-configuration ()
"Configure LSP servers specifically for a given project. "Configure LSP servers specifically for a given project.