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

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

[elpa] externals/eglot 856a224 62/69: Simplify jsonrpc-connection-send


From: João Távora
Subject: [elpa] externals/eglot 856a224 62/69: Simplify jsonrpc-connection-send
Date: Fri, 22 Jun 2018 11:55:05 -0400 (EDT)

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

    Simplify jsonrpc-connection-send
    
    * jsonrpc.el (jsonrpc-connection-send): Use args.
---
 jsonrpc.el | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/jsonrpc.el b/jsonrpc.el
index cec16b7..f063870 100644
--- a/jsonrpc.el
+++ b/jsonrpc.el
@@ -421,27 +421,22 @@ connection object, called when the process dies .")
 (cl-defmethod jsonrpc-connection-send ((connection jsonrpc-process-connection)
                                        &rest args
                                        &key
-                                       id
+                                       _id
                                        method
-                                       params
-                                       result
-                                       error)
+                                       _params
+                                       _result
+                                       _error
+                                       _partial)
   "Send MESSAGE, a JSON object, to CONNECTION."
-  (let* ((method
-          (cond ((keywordp method)
-                 (substring (symbol-name method) 1))
-                ((and method (symbolp method)) (symbol-name method))
-                (t method)))
-         (message `(:jsonrpc "2.0"
-                             ,@(when method `(:method ,method))
-                             ,@(when id     `(:id     ,id))
-                             ,@(when params `(:params ,params))
-                             ,@(when result `(:result ,result))
-                             ,@(when error  `(:error  ,error))))
-         (json (jsonrpc--json-encode message))
-         (headers
-          `(("Content-Length" . ,(format "%d" (string-bytes json)))
-            ("Content-Type" . "application/vscode-jsonrpc; charset=utf-8"))))
+  (plist-put args :method
+             (cond ((keywordp method) (substring (symbol-name method) 1))
+                   ((and method (symbolp method)) (symbol-name method))
+                   (t method)))
+  (let* ( (message `(:jsonrpc "2.0" ,@args))
+          (json (jsonrpc--json-encode message))
+          (headers
+           `(("Content-Length" . ,(format "%d" (string-bytes json)))
+             ("Content-Type" . "application/vscode-jsonrpc; charset=utf-8"))))
     (process-send-string
      (jsonrpc--process connection)
      (cl-loop for (header . value) in headers



reply via email to

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