Delete cider--ensure-session

nrepl-client now derives the session from the connection automatically.
There was a bug because in some requests specified a connection
different from the current one, but then ensure-session took the session
from the current-connection.

Author: Malabarba

cider-client.el

@@ -421,14 +421,6 @@ Signal an error if it is not supported."
   (unless (cider-nrepl-op-supported-p op)
     (error "Can't find nREPL middleware providing op \"%s\".  Please, install (or update) cider-nrepl %s and restart CIDER" op (upcase cider-version))))
 
-(defun cider--ensure-session (request)
-  "Make sure REQUEST has session.
-
-If the nREPL request lacks a session `cider-current-session' is added."
-  (if (seq-contains request "session")
-      request
-    (append request (list "session" (cider-current-session)))))
-
 (defun cider-nrepl-send-request (request callback &optional connection)
   "Send REQUEST and register response handler CALLBACK.
 REQUEST is a pair list of the form (\"op\" \"operation\" \"par1-name\"
@@ -437,17 +429,16 @@ If CONNECTION is provided dispatch to that connection instead of
 the current connection.
 
 Return the id of the sent message."
-  (nrepl-send-request (cider--ensure-session request) callback
-                      (or connection (cider-current-connection))))
+  (nrepl-send-request request callback (or connection (cider-current-connection))))
 
-(defun cider-nrepl-send-sync-request (request &optional abort-on-input connection)
+(defun cider-nrepl-send-sync-request (request &optional connection abort-on-input)
   "Send REQUEST to the nREPL server synchronously.
 Hold till final \"done\" message has arrived and join all response messages
 of the same \"op\" that came along and return the accumulated response.
 If ABORT-ON-INPUT is non-nil, the function will return nil
 at the first sign of user input, so as not to hang the
 interface."
-  (nrepl-send-sync-request (cider--ensure-session request)
+  (nrepl-send-sync-request request
                            (or connection (cider-current-connection))
                            abort-on-input))
 

nrepl-client.el

@@ -896,14 +896,17 @@ REQUEST is a pair list of the form (\"op\" \"operation\" \"par1-name\"
 \"par1\" ... ). See the code of `nrepl-request:clone',
 `nrepl-request:stdin', etc.
 Return the ID of the sent message."
-  (let* ((id (nrepl-next-request-id connection))
-         (request (cons 'dict (lax-plist-put request "id" id)))
-         (message (nrepl-bencode request)))
-    (nrepl-log-message request 'request)
-    (with-current-buffer connection
+  (with-current-buffer connection
+    (unless (or (plist-get request "session")
+                (not nrepl-session))
+      (setq request (append request (list "session" nrepl-session))))
+    (let* ((id (nrepl-next-request-id connection))
+           (request (cons 'dict (lax-plist-put request "id" id)))
+           (message (nrepl-bencode request)))
+      (nrepl-log-message request 'request)
       (puthash id callback nrepl-pending-requests)
-      (process-send-string nil message))
-    id))
+      (process-send-string nil message)
+      id)))
 
 (defvar nrepl-ongoing-sync-request nil
   "Dynamically bound to t while a sync request is ongoing.")
@@ -995,7 +998,7 @@ If LINE and COLUMN are non-nil and current buffer is a file buffer, \"line\",
                     "line" line
                     "column" column)))))
 
-(defun nrepl-request:eval (input callback connection session &optional ns line column)
+(defun nrepl-request:eval (input callback connection &optional session ns line column)
   "Send the request INPUT and register the CALLBACK as the response handler.
 The request is dispatched via CONNECTION and SESSION.  If NS is non-nil,
 include it in the request. LINE and COLUMN, if non-nil, define the position