emacs-diffs
[Top][All Lists]
Advanced

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

scratch/eldoc-async dfd267c: Avoid blinking for Eldoc's eldoc-documentat


From: Joo Tvora
Subject: scratch/eldoc-async dfd267c: Avoid blinking for Eldoc's eldoc-documentation-eager strategy
Date: Fri, 5 Jun 2020 07:01:41 -0400 (EDT)

branch: scratch/eldoc-async
commit dfd267c7597cd78a6cfe6a82d887493841287e96
Author: João Távora <joaotavora@gmail.com>
Commit: João Távora <joaotavora@gmail.com>

    Avoid blinking for Eldoc's eldoc-documentation-eager strategy
    
    "Blinking", or the very short-lived display of a lower priority Eldoc
    message, could happen if one of the members of
    eldoc-documentation-functions returned such elements shortly before
    returning a higher priority one.  This can happen in the LSP engine
    Eglot for some LSP servers.
    
    Reported by Andrii Kolomoiets <andreyk.mad@gmail.com> and Dmitry Gutov
    <dgutov@yandex.ru>.
    
    * lisp/emacs-lisp/eldoc.el (eldoc--enthusiasm-curbing-timer): New
    variable.
    (eldoc-print-current-symbol-info): Use it.  Use some more cl-isms.
---
 lisp/emacs-lisp/eldoc.el | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index a17cd0f..61fc0a8 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -517,6 +517,9 @@ The built-in values for this function already handle
 
 (defalias 'eldoc #'eldoc-print-current-symbol-info)
 
+(defvar eldoc--enthusiasm-curbing-timer nil
+  "Timer used by `eldoc-documentation-eager' to avoid blinking.")
+
 (defun eldoc-print-current-symbol-info ()
   "Document thing at point."
   (interactive)
@@ -529,7 +532,7 @@ The built-in values for this function already handle
       ;; Only keep looking for the info as long as the user hasn't
       ;; requested our attention.  This also locally disables inhibit-quit.
       (while-no-input
-        (let* ((pos 0)        ; how many hook functions have registered
+        (let* ((howmany 0)    ; how many hook functions have registered
                (want 0)       ; how many calls to `receive-doc' until we print
                (received '()) ; what we will print
                (receive-doc
@@ -537,23 +540,30 @@ The built-in values for this function already handle
                   (with-current-buffer buffer
                     (when (and string (> (length string) 0))
                       (push (cons pos (cons string plist)) received))
-                    (setq want (1- want))
+                    (cl-decf want)
                     (when (zerop want)
                       (eldoc--handle-docs
                        (mapcar #'cdr
-                               (sort received (lambda (d1 d2)
-                                                (< (car d1) (car d2))))))))))
+                               (cl-sort received #'< :key #'car)))))))
                (eldoc--make-callback
                 (lambda (eagerp)
-                  (let ((pos (setq pos (1+ pos))))
+                  (let ((pos (prog1 howmany (cl-incf howmany))))
                     (cond (eagerp
                            (lambda (string &rest plist)
                              (when (cl-loop for (p) in received
                                             never (< p pos))
                                (setq want 1 received '())
-                               (funcall receive-doc pos string plist))))
+                               ;; This really should be `timer-live-p'
+                               (when (and (timerp 
eldoc--enthusiasm-curbing-timer)
+                                          (memq eldoc--enthusiasm-curbing-timer
+                                                timer-list))
+                                 (cancel-timer 
eldoc--enthusiasm-curbing-timer))
+                               (setq eldoc--enthusiasm-curbing-timer
+                                     (run-at-time
+                                      (unless (zerop pos) 0.3)
+                                      nil receive-doc pos string plist)))))
                           (t
-                           (setq want (1+ want))
+                           (cl-incf want)
                            (lambda (string &rest plist)
                              (funcall receive-doc pos string plist)))))))
                (res (funcall eldoc-documentation-function)))



reply via email to

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