Skip to content

Commit 4b57a23

Browse files
vspinubbatsov
authored andcommitted
Rename logging nREPL function with nrepl-log- prefix
1 parent c6a49d5 commit 4b57a23

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

nrepl-client.el

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,8 +1099,8 @@ The message is logged to a buffer described by
10991099
(re-search-forward "^(" nil t)
11001100
(delete-region (point-min) (- (point) 1)))
11011101
(goto-char (point-max))
1102-
(nrepl--pp (nrepl-decorate-msg msg type)
1103-
(nrepl--message-color (lax-plist-get (cdr msg) "id"))
1102+
(nrepl-log-pp-object (nrepl-decorate-msg msg type)
1103+
(nrepl-log--message-color (lax-plist-get (cdr msg) "id"))
11041104
t)
11051105
(when-let ((win (get-buffer-window)))
11061106
(set-window-point win (point-max)))
@@ -1135,7 +1135,7 @@ BUTTON defaults the button at point."
11351135
(goto-char start)
11361136
(delete-overlay button)
11371137
(delete-region start end)
1138-
(nrepl--pp obj)
1138+
(nrepl-log-pp-object obj)
11391139
(delete-char -1)))
11401140
(error "No button at point")))
11411141

@@ -1152,7 +1152,7 @@ BUTTON defaults the button at point."
11521152
(nrepl-log-expand-button button)
11531153
(setq button (next-button pos)))))))
11541154

1155-
(defun nrepl--expand-button-mouse (event)
1155+
(defun nrepl-log--expand-button-mouse (event)
11561156
"Expand the text hidden under overlay button.
11571157
EVENT gives the button position on window."
11581158
(interactive "e")
@@ -1169,20 +1169,20 @@ EVENT gives the button position on window."
11691169
'face 'link
11701170
'help-echo "RET: Expand object."
11711171
;; Workaround for bug#1568.
1172-
'local-map '(keymap (mouse-1 . nrepl--expand-button-mouse)))
1172+
'local-map '(keymap (mouse-1 . nrepl-log--expand-button-mouse)))
11731173
(insert "\n"))
11741174

1175-
(defun nrepl--message-color (id)
1175+
(defun nrepl-log--message-color (id)
11761176
"Return the color to use when pretty-printing the nREPL message with ID.
11771177
If ID is nil, return nil."
11781178
(when id
11791179
(thread-first (string-to-number id)
11801180
(mod (length nrepl-message-colors))
11811181
(nth nrepl-message-colors))))
11821182

1183-
(defun nrepl--pp-listlike (object &optional foreground button)
1183+
(defun nrepl-log--pp-listlike (object &optional foreground button)
11841184
"Pretty print nREPL list like OBJECT.
1185-
FOREGROUND and BUTTON are as in `nrepl--pp'."
1185+
FOREGROUND and BUTTON are as in `nrepl-log-pp-object'."
11861186
(cl-flet ((color (str)
11871187
(propertize str 'face
11881188
(append '(:weight ultra-bold)
@@ -1201,12 +1201,12 @@ FOREGROUND and BUTTON are as in `nrepl--pp'."
12011201
(unless (eq (car object) 'dict)
12021202
'font-lock-keyword-face)))))
12031203
(insert str)
1204-
(nrepl--pp (cadr l) nil button)))
1204+
(nrepl-log-pp-object (cadr l) nil button)))
12051205
(when (eq (car object) 'dict)
12061206
(delete-char -1))
12071207
(insert (color ")\n")))))))
12081208

1209-
(defun nrepl--pp (object &optional foreground button)
1209+
(defun nrepl-log-pp-object (object &optional foreground button)
12101210
"Pretty print nREPL OBJECT, delimited using FOREGROUND.
12111211
If BUTTON is non-nil, try making a button from OBJECT instead of inserting
12121212
it into the buffer."
@@ -1218,12 +1218,12 @@ it into the buffer."
12181218
(cond
12191219
;; top level dicts (always expanded)
12201220
((memq head '(<-- -->))
1221-
(nrepl--pp-listlike object foreground button))
1221+
(nrepl-log--pp-listlike object foreground button))
12221222
;; inner dicts
12231223
((eq head 'dict)
12241224
(if (and button (> (length object) min-dict-fold-size))
12251225
(nrepl-log-insert-button "(dict ...)" object)
1226-
(nrepl--pp-listlike object foreground button)))
1226+
(nrepl-log--pp-listlike object foreground button)))
12271227
;; lists
12281228
(t
12291229
(if (and button (> (length object) min-list-fold-size))

0 commit comments

Comments
 (0)