Skip to content

Commit e42e675

Browse files
Appease linter gods
1 parent 4ae51e7 commit e42e675

File tree

5 files changed

+27
-33
lines changed

5 files changed

+27
-33
lines changed

cider-client.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,15 @@ Assuming this is the Clojure map you want to use as `cljfmt' options:
249249
250250
you need to encode it as the following plist:
251251
252-
'((\"indents\" ((\"org.me/foo\" ((\"inner\" 0))))) (\"alias-map\" ((\"me\" \"org.me\"))))"
252+
\\='((\"indents\" ((\"org.me/foo\" ((\"inner\" 0))))) (\"alias-map\" ((\"me\" \"org.me\"))))"
253253
:type 'list
254254
:group 'cider
255255
:package-version '(cider . "1.1.0"))
256256

257257
(defun cider--nrepl-format-code-request-map (&optional format-options)
258258
"Map to merge into requests that require code formatting.
259259
If non-nil, FORMAT-OPTIONS specifies the options cljfmt will use to format
260-
the code. See `cider-format-code-options` for details."
260+
the code. See `cider-format-code-options' for details."
261261
(when format-options
262262
(let* ((indents-dict (when (assoc "indents" format-options)
263263
(thread-last
@@ -320,7 +320,7 @@ nil."
320320
"A map of options that will be passed to `cider-print-fn'.
321321
Here's an example for `pprint':
322322
323-
'((\"length\" 50) (\"right-margin\" 70))"
323+
\\='((\"length\" 50) (\"right-margin\" 70))"
324324
:type 'list
325325
:group 'cider
326326
:package-version '(cider . "0.21.0"))

cider-connection.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ We look only at the major and minor components. When the major
264264
version is 0, only check that the minor versions match. When the major version
265265
is > 0, first check that the major version matches, then that the minor
266266
version is >= the required minor version.
267-
VER the 'installed' version,
267+
VER the `installed' version,
268268
REQUIRED-VER the version required by cider."
269269
(let ((ver* (cider--strip-version-patch ver))
270270
(required-ver* (cider--strip-version-patch required-ver)))
@@ -785,7 +785,7 @@ Session name can be customized with `cider-session-name-template'."
785785
;;; REPL Buffer Init
786786

787787
(defvar-local cider-cljs-repl-type nil
788-
"The type of the ClojureScript runtime ('browser, 'node, 'figwheel, etc.).")
788+
"The type of the ClojureScript runtime (\\='browser, \\='node, \\='figwheel, etc.).")
789789

790790
(defvar-local cider-repl-type nil
791791
"The type of this REPL buffer, usually either clj or cljs.")

cider-selector.el

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ selects a buffer.
104104
BODY is a series of forms which are evaluated when the selector
105105
is chosen. The returned buffer is selected with
106106
`switch-to-buffer'."
107+
(declare (indent 1))
107108
(let ((method `(lambda ()
108109
(let ((buffer (progn ,@body)))
109110
(cond ((not (and buffer (get-buffer buffer)))
@@ -135,41 +136,33 @@ is chosen. The returned buffer is selected with
135136
(cl-pushnew (list ?4 "Select in other window" (lambda () (cider-selector t)))
136137
cider-selector-methods :key #'car)
137138

138-
(def-cider-selector-method ?c
139-
"Most recently visited clojure-mode buffer."
139+
(def-cider-selector-method ?c "Most recently visited clojure-mode buffer."
140140
(cider-selector--recently-visited-buffer '(clojure-mode clojure-ts-mode)))
141141

142-
(def-cider-selector-method ?e
143-
"Most recently visited emacs-lisp-mode buffer."
142+
(def-cider-selector-method ?e "Most recently visited emacs-lisp-mode buffer."
144143
(cider-selector--recently-visited-buffer 'emacs-lisp-mode))
145144

146145
(def-cider-selector-method ?q "Abort."
147146
(top-level))
148147

149-
(def-cider-selector-method ?r
150-
"Current REPL buffer or as a fallback, the most recently
148+
(def-cider-selector-method ?r "Current REPL buffer or as a fallback, the most recently
151149
visited cider-repl-mode buffer."
152150
(or (cider-current-repl)
153151
(cider-selector--recently-visited-buffer 'cider-repl-mode)))
154152

155-
(def-cider-selector-method ?m
156-
"Current connection's *nrepl-messages* buffer."
153+
(def-cider-selector-method ?m "Current connection's *nrepl-messages* buffer."
157154
(nrepl-messages-buffer (cider-current-repl)))
158155

159-
(def-cider-selector-method ?x
160-
"*cider-error* buffer."
156+
(def-cider-selector-method ?x "*cider-error* buffer."
161157
cider-error-buffer)
162158

163-
(def-cider-selector-method ?p
164-
"*cider-profile* buffer."
159+
(def-cider-selector-method ?p "*cider-profile* buffer."
165160
cider-profile-buffer)
166161

167-
(def-cider-selector-method ?d
168-
"*cider-doc* buffer."
162+
(def-cider-selector-method ?d "*cider-doc* buffer."
169163
cider-doc-buffer)
170164

171-
(def-cider-selector-method ?s
172-
"*cider-scratch* buffer."
165+
(def-cider-selector-method ?s "*cider-scratch* buffer."
173166
(cider-scratch-find-or-create-buffer))
174167

175168
(provide 'cider-selector)

nrepl-client.el

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -833,13 +833,13 @@ to the REPL."
833833
truncated-handler)
834834
"Make a response handler for connection BUFFER.
835835
A handler is a function that takes one argument - response received from
836-
the server process. The response is an alist that contains at least 'id'
837-
and 'session' keys. Other standard response keys are 'value', 'out', 'err',
838-
and 'status'.
836+
the server process. The response is an alist that contains at least `id'
837+
and `session' keys. Other standard response keys are `value', `out', `err',
838+
and `status'.
839839
840840
The presence of a particular key determines the type of the response. For
841-
example, if 'value' key is present, the response is of type 'value', if
842-
'out' key is present the response is 'stdout' etc.
841+
example, if `value' key is present, the response is of type `value', if
842+
`out' key is present the response is `stdout' etc.
843843
844844
Depending on the type, the handler dispatches the appropriate value to one
845845
of the supplied handlers: VALUE-HANDLER, STDOUT-HANDLER, STDERR-HANDLER,
@@ -926,7 +926,7 @@ the standard session."
926926
(when-let* ((session (if tooling nrepl-tooling-session nrepl-session)))
927927
(setq request (append request `("session" ,session))))
928928
(let* ((id (nrepl-next-request-id connection))
929-
(request (cons 'dict (lax-plist-put request "id" id)))
929+
(request (cons 'dict (plist-put request "id" id #'equal)))
930930
(message (nrepl-bencode request)))
931931
(nrepl-log-message request 'request)
932932
(puthash id callback nrepl-pending-requests)
@@ -1219,7 +1219,7 @@ up."
12191219
(defun nrepl-server-sentinel (process event)
12201220
"Handle nREPL server PROCESS EVENT.
12211221
If the nREPL PROCESS failed to initiate and encountered a fatal EVENT
1222-
signal, raise an 'error'. Additionally, if the EVENT signal is SIGHUP,
1222+
signal, raise an `error'. Additionally, if the EVENT signal is SIGHUP,
12231223
close any existing client connections."
12241224
;; only interested on fatal signals.
12251225
(when (not (process-live-p process))
@@ -1316,8 +1316,9 @@ described by `nrepl-message-buffer-name-template'."
13161316
;; append a time-stamp to the message before logging it
13171317
;; the time-stamps are quite useful for debugging
13181318
(setq msg (cons (car msg)
1319-
(lax-plist-put (cdr msg) "time-stamp"
1320-
(format-time-string "%Y-%m-%0d %H:%M:%S.%N"))))
1319+
(plist-put (cdr msg) "time-stamp"
1320+
(format-time-string "%Y-%m-%0d %H:%M:%S.%N")
1321+
#'equal)))
13211322
(with-current-buffer (nrepl-messages-buffer (current-buffer))
13221323
(setq buffer-read-only nil)
13231324
(when (> (buffer-size) nrepl-message-buffer-max-size)
@@ -1326,7 +1327,7 @@ described by `nrepl-message-buffer-name-template'."
13261327
(delete-region (point-min) (- (point) 1)))
13271328
(goto-char (point-max))
13281329
(nrepl-log-pp-object (nrepl-decorate-msg msg type)
1329-
(nrepl-log--message-color (lax-plist-get (cdr msg) "id"))
1330+
(nrepl-log--message-color (plist-get (cdr msg) "id" #'equal))
13301331
t)
13311332
(when-let* ((win (get-buffer-window)))
13321333
(set-window-point win (point-max)))

nrepl-dict.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ removed in a future release."
7373
(if (nrepl-dict-p dict)
7474
;; Note: The structure of the following expression avoids the
7575
;; expensive containment check in nearly all cases, see #3717
76-
(or (lax-plist-get (cdr dict) key)
76+
(or (plist-get (cdr dict) key #'equal)
7777
;; TODO: remove DEFAULT argument and the following clause
7878
(when default
7979
(and (not (nrepl-dict-contains dict key))
@@ -87,7 +87,7 @@ Return new dict. Dict is modified by side effects."
8787
`(dict ,key ,value)
8888
(if (not (nrepl-dict-p dict))
8989
(error "Not an nREPL dict object: %s" dict)
90-
(setcdr dict (lax-plist-put (cdr dict) key value))
90+
(setcdr dict (plist-put (cdr dict) key value #'equal))
9191
dict)))
9292

9393
(defun nrepl-dict-keys (dict)

0 commit comments

Comments
 (0)