[Top][All Lists]

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

[elpa] externals/eglot c790274 39/69: jsonrpc--next-request-id is a conn

From: João Távora
Subject: [elpa] externals/eglot c790274 39/69: jsonrpc--next-request-id is a connection slot
Date: Fri, 22 Jun 2018 11:55:00 -0400 (EDT)

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

    jsonrpc--next-request-id is a connection slot
    * jsonrpc.el (jsonrpc-connection): Make jsonrpc--next-request-id a
    (jsonrpc--next-request-id): Remove this variable.
    (jsonrpc--async-request-1): Use slot.
 jsonrpc.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/jsonrpc.el b/jsonrpc.el
index beb3d01..a8c86d0 100644
--- a/jsonrpc.el
+++ b/jsonrpc.el
@@ -133,7 +133,7 @@
 (require 'subr-x)
 (require 'warnings)
 (require 'pcase)
-(require 'ert)
+(require 'ert) ; to escape a `condition-case-unless-debug'
 (require 'array) ; xor
 (defvar jsonrpc-find-connection-functions nil
@@ -206,7 +206,11 @@ FORMAT as the message."
     :accessor jsonrpc--deferred-actions
     :documentation "Map (DEFERRED BUF) to (FN TIMER ID).  FN is\
 a saved DEFERRED `async-request' from BUF, to be sent not later\
-than TIMER as ID.")))
+than TIMER as ID.")
+   (-next-request-id
+    :initform 0
+    :accessor jsonrpc--next-request-id
+    :documentation "Next number used for a request")))
 (defclass jsonrpc-process-connection (jsonrpc-connection)
@@ -544,9 +548,6 @@ for sending requests immediately."
 (defconst jrpc-default-request-timeout 10
   "Time in seconds before timing out a JSONRPC request.")
-(defvar-local jsonrpc--next-request-id 0)
 (cl-defun jsonrpc-async-request (connection
@@ -593,7 +594,7 @@ TIMEOUT is nil)."
                (`(,_ ,timer ,old-id)
                 (and deferred (gethash (list deferred buf)
-               (id (or old-id (cl-incf jsonrpc--next-request-id)))
+               (id (or old-id (cl-incf (jsonrpc--next-request-id connection))))
                 (lambda ( )
                   (when timeout

reply via email to

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