Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lisp/cider-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@

(defun cider--modeline-info ()
"Return info for the cider mode modeline.
Info contains the connection type, project name and host:port endpoint."
(if-let* ((current-connection (ignore-errors (cider-current-repl))))
(with-current-buffer current-connection
Info contains the REPL type, project name and host:port endpoint."
(if-let* ((current-repl (ignore-errors (cider-current-repl))))
(with-current-buffer current-repl
(concat
(symbol-name cider-repl-type)
(when cider-mode-line-show-connection
Expand Down
14 changes: 7 additions & 7 deletions lisp/cider-session.el
Original file line number Diff line number Diff line change
Expand Up @@ -274,17 +274,17 @@ By default it assumes the connection buffer is current."
(buffer-local-value 'cider-repl-cljs-upgrade-pending repl-buffer))

(defvar-local cider-repl-type-override nil
"When non-nil, the connection type (clj, cljs or multi) used for this buffer.
"When non-nil, the REPL type (clj, cljs or multi) used for this buffer.
Overrides the major-mode-based inference in `cider-repl-type-for-buffer'.
Buffers with no inherent file type - e.g. `*cider-scratch*' - set this to
control where their evaluations are dispatched.")

(defun cider-repl-type-for-buffer (&optional buffer)
"Return the matching connection type (clj or cljs) for BUFFER.
"Return the matching REPL type (clj or cljs) for BUFFER.
BUFFER defaults to the `current-buffer'. In cljc buffers return
multi. This function infers connection type based on the major mode,
multi. This function infers the REPL type based on the major mode,
unless `cider-repl-type-override' is set.
For the REPL type use the function `cider-repl-type'."
To get a REPL buffer's own type use the function `cider-repl-type'."
(with-current-buffer (or buffer (current-buffer))
(cond
(cider-repl-type-override cider-repl-type-override)
Expand Down Expand Up @@ -578,7 +578,7 @@ no linked session or there is no REPL of TYPE within the current session."
sessions)))

(defun cider--extract-connections (sessions)
"Return a flattened list of all session buffers in SESSIONS."
"Return a flattened list of all REPL buffers in SESSIONS."
(seq-reduce (lambda (x y)
(append x (cdr y)))
sessions
Expand Down Expand Up @@ -655,10 +655,10 @@ REPL's session is used instead of the current one (taking precedence over
(defun cider-map-repls (which function)
"Call FUNCTION once for each appropriate REPL as indicated by WHICH.
The function is called with one argument, the REPL buffer. The appropriate
connections are found by inspecting the current buffer. WHICH is either one of
REPLs are found by inspecting the current buffer. WHICH is either one of
the following keywords or a list starting with one of them followed by names of
operations that the REPL is expected to support:
:auto - Act on the connections whose type matches the current buffer. In
:auto - Act on the REPLs whose type matches the current buffer. In
`cljc' files, mapping happens over both types of REPLs.
:clj (:cljs) - Map over clj (cljs)) REPLs only.
:clj-strict (:cljs-strict) - Map over clj (cljs) REPLs but signal a
Expand Down
10 changes: 5 additions & 5 deletions lisp/cider-tracing.el
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ Defaults to the current ns. With prefix arg QUERY, prompts for a ns."
(defvar-local cider-trace--subscription nil
"Id of this buffer's active trace subscription, or nil.")

(defvar-local cider-trace--connection nil
"The REPL connection this trace buffer is subscribed through.")
(defvar-local cider-trace--repl nil
"The REPL buffer this trace buffer is subscribed through.")

(defvar-local cider-trace--open-calls nil
"Hash table of call id -> marker at the start of that call's children.
Expand Down Expand Up @@ -289,13 +289,13 @@ EVENT is the mouse event, when invoked with the mouse."
"Tear down this buffer's trace subscription, if any.
Fires a best-effort async request, since this runs from `kill-buffer-hook'."
(when (and cider-trace--subscription
(buffer-live-p cider-trace--connection))
(buffer-live-p cider-trace--repl))
(ignore-errors
(cider-nrepl-send-request
(list "op" "cider/trace-unsubscribe"
"subscription" cider-trace--subscription)
#'ignore
cider-trace--connection))
cider-trace--repl))
(setq cider-trace--subscription nil)))

(defun cider-trace-clear ()
Expand Down Expand Up @@ -356,7 +356,7 @@ cluttering the REPL. Killing the buffer stops the streaming."
(with-current-buffer buffer
(unless (eq major-mode 'cider-trace-mode)
(cider-trace-mode))
(setq cider-trace--connection connection)
(setq cider-trace--repl connection)
(unless cider-trace--subscription
(cider-nrepl-send-request
'("op" "cider/trace-subscribe")
Expand Down
Loading