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

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

[elpa] externals/eglot 2775dea 003/139: Rename eglot--continuations eglo


From: João Távora
Subject: [elpa] externals/eglot 2775dea 003/139: Rename eglot--continuations eglot--pending-continuations
Date: Mon, 14 May 2018 09:54:40 -0400 (EDT)

branch: externals/eglot
commit 2775deaf534eab2b919ef99fc7da957987a02092
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>

    Rename eglot--continuations eglot--pending-continuations
---
 eglot.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/eglot.el b/eglot.el
index f2ef418..166f23c 100644
--- a/eglot.el
+++ b/eglot.el
@@ -67,7 +67,7 @@
 (eglot--define-process-var eglot--expected-bytes nil
   "How many bytes declared by server")
 
-(eglot--define-process-var eglot--continuations (make-hash-table)
+(eglot--define-process-var eglot--pending-continuations (make-hash-table)
   "A hash table of request ID to continuation lambdas")
 
 (eglot--define-process-var eglot--events-buffer nil
@@ -264,12 +264,14 @@
   (let* ((response-id (plist-get message :id))
          (err (plist-get message :error))
          (continuations (and response-id
-                             (gethash response-id (eglot--continuations)))))
+                             (gethash response-id 
(eglot--pending-continuations)))))
     (cond ((and response-id
                 (not continuations))
            (eglot--warn "Ooops no continuation for id %s" response-id))
           (continuations
            (cancel-timer (third continuations))
+           (remhash response-id
+                    (eglot--pending-continuations))
            (cond (err
                   (apply (second continuations) err))
                  (t
@@ -303,7 +305,7 @@
          (timeout-fn (or timeout-fn
                          (lambda ()
                            (eglot--warn "Tired of waiting for reply to %s" id)
-                           (remhash id (eglot--continuations process)))))
+                           (remhash id (eglot--pending-continuations 
process)))))
          (error-fn (or error-fn
                        (cl-function
                         (lambda (&key code message)
@@ -330,7 +332,7 @@
                                          timeout-fn
                                        (lambda ()
                                          (throw catch-tag (apply 
timeout-fn))))))
-               (eglot--continuations process))
+               (eglot--pending-continuations process))
       (unless async-p
         (while t
           (unless (eq (process-status process) 'open)



reply via email to

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