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

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

[elpa] externals/eglot 212a7f7 43/54: Per #315: call shutdown/exit metho


From: João Távora
Subject: [elpa] externals/eglot 212a7f7 43/54: Per #315: call shutdown/exit methods with params:{}, not null
Date: Thu, 16 Apr 2020 05:31:52 -0400 (EDT)

branch: externals/eglot
commit 212a7f7ba5f8480b3f94c41e77e21e953685937c
Author: Vladimir Panteleev <address@hidden>
Commit: Felicián Németh <address@hidden>

    Per #315: call shutdown/exit methods with params:{}, not null
    
    "null" is not a valid JSON value for "params" according to the
    JSON-RPC specification.
    
    * eglot.el (eglot-shutdown): Do the same thing as for "initialized",
    and use an empty hash table to be serialized to {}.
    
    Copyright-paperwork-exempt: yes
---
 eglot.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eglot.el b/eglot.el
index 1decb26..1bdca12 100644
--- a/eglot.el
+++ b/eglot.el
@@ -595,8 +595,9 @@ SERVER.  ."
   (unwind-protect
       (progn
         (setf (eglot--shutdown-requested server) t)
-        (jsonrpc-request server :shutdown nil :timeout (or timeout 1.5))
-        (jsonrpc-notify server :exit nil))
+        (jsonrpc-request server :shutdown (make-hash-table)
+                         :timeout (or timeout 1.5))
+        (jsonrpc-notify server :exit (make-hash-table)))
     ;; Now ask jsonrpc.el to shut down the server.
     (jsonrpc-shutdown server (not preserve-buffers))
     (unless preserve-buffers (kill-buffer (jsonrpc-events-buffer server)))))



reply via email to

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