Skip to content

fix: Address most compile warnings #3858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcs090218 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: Address most compile warnings #3858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a7961c
fix: Address most compile warnings
jcs090218 Jan 30, 2026
ccaa44b
fix: Try raw definition
jcs090218 Jan 31, 2026
b690aae
fix: Revert using old methods
jcs090218 Jan 31, 2026
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
7 changes: 3 additions & 4 deletions lisp/cider-browse-ns.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@
(defcustom cider-browse-ns-default-filters nil
"List of default hide filters to apply to browse-ns buffer.

Available options include `private', `test', `macro', `function', and
`var'."
:type 'list
Available options include `private', `test', `macro', `function', and `var'."
:type '(list symbol)
:package-version '(cider . "1.4.0"))

(defconst cider-browse-ns-buffer "*cider-ns-browser*")
Expand Down Expand Up @@ -455,7 +454,7 @@ var-meta map."

(defun cider-browse-ns--thing-at-point ()
"Get the thing at point.
Return a list of the type ('ns or 'var) and the value."
Return a list of the type (\\='ns or \\='var) and the value."
(let ((ns-p (get-text-property (point) 'ns))
(line (car (split-string (string-trim (thing-at-point 'line)) " "))))
(if (or ns-p (string-match "\\." line))
Expand Down
2 changes: 1 addition & 1 deletion lisp/cider-common.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ in the container, the alist would be `((\"/src\" \"~/projects/foo/src\"))."
"Attempt to translate the PATH in the given DIRECTION, optionally RETURN-ALL.
Looks at `cider-path-translations' for (container . host) alist of path
prefixes and translates PATH from container to host or vice-versa depending on
whether DIRECTION is 'from-nrepl or 'to-nrepl."
whether DIRECTION is \\='from-nrepl or \\='to-nrepl."
(seq-let [from-fn to-fn path-fn] (cond ((eq direction 'from-nrepl) '(car cdr identity))
((eq direction 'to-nrepl) '(cdr car expand-file-name)))
(let ((f (lambda (translation)
Expand Down
4 changes: 2 additions & 2 deletions lisp/cider-completion.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ backend, and ABBREVIATION is a short form of that type."
(defcustom cider-completion-annotations-include-ns 'unqualified
"Controls passing of namespaces to `cider-annotate-completion-function'.
When set to 'always, the candidate's namespace will always be passed if it
is available. When set to 'unqualified, the namespace will only be passed
When set to \\='always, the candidate's namespace will always be passed if it
is available. When set to \\='unqualified, the namespace will only be passed
if the candidate is not namespace-qualified."
:type '(choice (const always)
(const unqualified)
Expand Down
5 changes: 3 additions & 2 deletions lisp/cider-debug.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ list."
:type '(alist :key-type character
:value-type (list
(string :tag "command name")
(choice (string :tag "display name") nil)))
(choice (string :tag "display name")
(const nil))))
:package-version '(cider . "0.24.0"))

(defun cider--debug-format-locals-list (locals)
Expand Down Expand Up @@ -507,7 +508,7 @@ REASON is a keyword describing why this buffer was necessary."
COORDINATES is a list of integers that specify how to navigate into the
sexp that is after point when this function is called.
As an example, a COORDINATES list of '(1 0 2) means:
As an example, a COORDINATES list of \\='(1 0 2) means:
- enter next sexp then `forward-sexp' once,
- enter next sexp,
- enter next sexp then `forward-sexp' twice.
Expand Down
2 changes: 1 addition & 1 deletion lisp/cider-doc.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ Tables are marked to be ignored by line wrap."
(put-text-property (org-table-begin) (org-table-end) 'block 'table)))))))

(defun cider-docview-wrap-text (buffer)
"For text in BUFFER not propertized as 'block', apply line wrap."
"For text in BUFFER not propertized as `block', apply line wrap."
Copy link
Member

@bbatsov bbatsov Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better remove the quotes here IMO.

(with-current-buffer buffer
(save-excursion
(while (not (eobp))
Expand Down
10 changes: 5 additions & 5 deletions lisp/cider-eval.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@

(defcustom cider-show-error-buffer t
"Control the popup behavior of cider stacktraces.
The following values are possible t or 'always, 'except-in-repl,
'only-in-repl. Any other value, including nil, will cause the stacktrace
The following values are possible t or \\='always, \\='except-in-repl,
\\='only-in-repl. Any other value, including nil, will cause the stacktrace
not to be automatically shown.

Irrespective of the value of this variable, the `cider-error-buffer' is
Expand All @@ -88,7 +88,7 @@ in order to void its effect."
(defcustom cider-auto-jump-to-error t
"Control the cursor jump behavior in compilation error buffer.
When non-nil automatically jump to error location during interactive
compilation. When set to 'errors-only, don't jump to warnings.
compilation. When set to \\='errors-only, don't jump to warnings.
When set to nil, don't jump at all."
:type '(choice (const :tag "always" t)
(const errors-only)
Expand Down Expand Up @@ -120,7 +120,7 @@ Only applies when the *cider-inspect* buffer is currently visible."
(defcustom cider-save-file-on-load 'prompt
"Controls whether to prompt to save the file when loading a buffer.
If nil, files are not saved.
If 'prompt, the user is prompted to save the file if it's been modified.
If \\='prompt, the user is prompted to save the file if it's been modified.
If t, save the file without confirmation."
:type '(choice (const :tag "Prompt to save the file if it's been modified" prompt)
(const :tag "Don't save the file" nil)
Expand Down Expand Up @@ -336,7 +336,7 @@ If you wish phases to be ignored, set this variable to nil instead.

You can learn more about Clojure's error phases at:
https://clojure.org/reference/repl_and_main#_at_repl"
:type 'list
:type '(list string)
:group 'cider
:package-version '(cider . "0.18.0"))

Expand Down
4 changes: 2 additions & 2 deletions lisp/cider-inspector.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ The page size can be also changed interactively within the inspector."

(defcustom cider-inspector-max-atom-length 150
"Default max length of nested atoms before they are truncated.
'Atom' here means any collection member that satisfies (complement coll?).
`Atom' here means any collection member that satisfies (complement coll?).
The max length can be also changed interactively within the inspector."
:type '(integer :tag "Max atom length" 150)
:package-version '(cider . "1.1.0"))
Expand Down Expand Up @@ -623,7 +623,7 @@ from stack), `:next-inspectable' (move point to next inspectable object)."

(defun cider-find-inspectable-object (direction limit)
"Find the next/previous inspectable object.
DIRECTION can be either 'next or 'prev.
DIRECTION can be either \\='next or \\='prev.
LIMIT is the maximum or minimum position in the current buffer.

Return a list of two values: If an object could be found, the
Expand Down
6 changes: 3 additions & 3 deletions lisp/cider-macroexpansion.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
"Determines if namespaces are displayed in the macroexpansion buffer.
Possible values are:
'qualified ;=> Vars are fully-qualified in the expansion
'none ;=> Vars are displayed without namespace qualification
'tidy ;=> Vars that are :refer-ed or defined in the current namespace are
`qualified ;=> Vars are fully-qualified in the expansion
Copy link
Member

@bbatsov bbatsov Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the use of different quotes here?

`none ;=> Vars are displayed without namespace qualification
`tidy ;=> Vars that are :refer-ed or defined in the current namespace are
displayed with their simple name, non-referred vars from other
namespaces are referred using the alias for that namespace (if
defined), other vars are displayed fully qualified."
Expand Down
5 changes: 3 additions & 2 deletions lisp/cider-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
(require 'cider-completion-context)
(require 'cider-inspector)
(require 'cider-find)
(require 'cider-log)
(require 'cider-xref-backend)
(require 'subr-x)

Expand Down Expand Up @@ -465,8 +466,8 @@ If invoked with a prefix ARG eval the expression after inserting it."
(defconst cider--has-many-mouse-buttons (not (memq window-system '(mac ns)))
"Non-nil if system binds forward and back buttons to <mouse-8> and <mouse-9>.

As it stands Emacs fires these events on <mouse-8> and <mouse-9> on 'x' and
'w32'systems while on macOS it presents them on <mouse-4> and <mouse-5>.")
As it stands Emacs fires these events on <mouse-8> and <mouse-9> on `x' and
Copy link
Member

@bbatsov bbatsov Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd drop the quotes and make X uppercase.

`w32'systems while on macOS it presents them on <mouse-4> and <mouse-5>.")
Copy link
Member

@bbatsov bbatsov Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably we can remove the quotes here completely, as the proposed quoting definitely seems incorrect given it was referring to the value of window-system.


(defcustom cider-use-xref t
"Enable xref integration."
Expand Down
8 changes: 4 additions & 4 deletions lisp/cider-ns.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
(defcustom cider-ns-save-files-on-refresh 'prompt
"Controls whether to prompt to save files before refreshing.
If nil, files are not saved.
If 'prompt, the user is prompted to save files if they have been modified.
If \\='prompt, the user is prompted to save files if they have been modified.
If t, save the files without confirmation."
:type '(choice (const :tag "Prompt to save files if they have been modified" prompt)
(const :tag "Don't save the files" nil)
Expand Down Expand Up @@ -248,7 +248,7 @@ Based on OP-NAME and the value of cider-ns-code-reload-tool defcustom."

;;;###autoload
(defun cider-ns-reload (&optional prompt)
"Send a (require 'ns :reload) to the REPL.
"Send a (require \\='ns :reload) to the REPL.
With an argument PROMPT, it prompts for a namespace name. This is the
Clojure out of the box reloading experience and does not rely on
Expand All @@ -263,7 +263,7 @@ identified libs even if they are already loaded\"."

;;;###autoload
(defun cider-ns-reload-all (&optional prompt)
"Send a (require 'ns :reload-all) to the REPL.
"Send a (require \\='ns :reload-all) to the REPL.
With an argument PROMPT, it prompts for a namespace name. This is the
Clojure out of the box reloading experience and does not rely on
Expand All @@ -280,7 +280,7 @@ indirectly load via require\"."
;;;###autoload
(defun cider-ns-refresh (&optional mode)
"Reload modified and unloaded namespaces, using the Reloaded Workflow.
Uses the configured 'refresh dirs' \(defaults to the classpath dirs).
Uses the configured `refresh dirs' \(defaults to the classpath dirs).
With a single prefix argument, or if MODE is `refresh-all', reload all
namespaces on the classpath dirs unconditionally.
Expand Down
10 changes: 5 additions & 5 deletions lisp/cider-overlays.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ see `cider-debug-use-overlays'."

(defcustom cider-result-overlay-position 'at-eol
"Where to display result overlays for inline evaluation and the debugger.
If 'at-eol, display at the end of the line.
If 'at-point, display at the end of the respective sexp."
If \\='at-eol, display at the end of the line.
If \\='at-point, display at the end of the respective sexp."
:group 'cider
:type ''(choice (const :tag "End of line" at-eol)
(const :tag "End of sexp" at-point))
:type '(choice (const :tag "End of line" at-eol)
(const :tag "End of sexp" at-point))
:package-version '(cider . "0.23.0"))

(defcustom cider-eval-result-prefix "=> "
Expand Down Expand Up @@ -122,7 +122,7 @@ Never throws errors, and can be used in an overlay's modification-hooks."
"Place an overlay between L and R and return it.
TYPE is a symbol put on the overlay's category property. It is used to
easily remove all overlays from a region with:
(remove-overlays start end 'category TYPE)
(remove-overlays start end \\='category TYPE)
PROPS is a plist of properties and values to add to the overlay."
(let ((o (make-overlay l (or r l) (current-buffer))))
(overlay-put o 'category type)
Expand Down
8 changes: 4 additions & 4 deletions lisp/cider-repl.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,7 +1343,7 @@ case."
"Workhorse for getting locref at point.
REG-LIST is an entry in `cider-locref-regexp-alist'."
(beginning-of-line)
(when (re-search-forward (nth 1 reg-list) (point-at-eol) t)
(when (re-search-forward (nth 1 reg-list) (line-end-position) t)
(let ((ix-highlight (or (nth 2 reg-list) 0))
(ix-var (nth 3 reg-list))
(ix-file (nth 4 reg-list))
Expand All @@ -1369,7 +1369,7 @@ for locref look up."
(goto-char (or pos (point)))
;; Regexp lookup on long lines can result in significant hangs #2532. We
;; assume that lines longer than 300 don't contain source references.
(when (< (- (point-at-eol) (point-at-bol)) 300)
(when (< (- (line-end-position) (line-beginning-position)) 300)
(seq-some (lambda (rl) (cider--locref-at-point-1 rl))
cider-locref-regexp-alist))))

Expand Down Expand Up @@ -1483,7 +1483,7 @@ Return -1 resp the length of the history if no item matches."

(defun cider-repl--history-replace (direction &optional regexp)
"Replace the current input with the next line in DIRECTION.
DIRECTION is 'forward' or 'backward' (in the history list).
DIRECTION is \\='forward' or \\='backward' (in the history list).
If REGEXP is non-nil, only lines matching REGEXP are considered."
(setq cider-repl-history-pattern regexp)
(let* ((min-pos -1)
Expand Down Expand Up @@ -1854,7 +1854,7 @@ The checking is done as follows:
(defun cider-debug-sesman-friendly-session-p ()
"`message's debugging information relative to friendly sessions.

This is useful for when one sees 'No linked CIDER sessions'
This is useful for when one sees `No linked CIDER sessions'
in an unexpected place."
(interactive)
(message (prin1-to-string (mapcar (lambda (session)
Expand Down
16 changes: 8 additions & 8 deletions lisp/cider-stacktrace.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ override this and ensure that those frames are shown."
(defun cider-stacktrace-indicate-filters (filters pos-filters)
"Update enabled state of filter buttons.

Find buttons with a 'filter property; if filter is a member of FILTERS, or
if filter is nil ('show all') and the argument list is non-nil, fontify the
button as disabled. Upon finding text with a 'hidden-count property, stop
Find buttons with a \\='filter property; if filter is a member of FILTERS, or
if filter is nil (`show all') and the argument list is non-nil, fontify the
button as disabled. Upon finding text with a \\='hidden-count property, stop
searching and update the hidden count text. POS-FILTERS is the list of
positive filters to always include."
(with-current-buffer cider-error-buffer
Expand Down Expand Up @@ -370,7 +370,7 @@ filters for the resulting machinery."
"Return intersection of ERROR-TYPES and CIDER-STACKTRACE-SUPPRESSED-ERRORS.
I.e, Return non-nil if the seq ERROR-TYPES shares any elements with
`cider-stacktrace-suppressed-errors'. This means that even a
'well-behaved' (ie, promoted) error type will be 'guilty by association' if
`well-behaved' (ie, promoted) error type will be `guilty by association' if
grouped with a suppressed error type."
(seq-intersection error-types cider-stacktrace-suppressed-errors))

Expand Down Expand Up @@ -634,7 +634,7 @@ others."
(car filter))))
(insert " "))

(let ((hidden "(0 frames hidden)"))
(let ((hidden (copy-sequence "(0 frames hidden)")))
(put-text-property 0 (length hidden) 'hidden-count t hidden)
(insert " " hidden "\n"))))

Expand Down Expand Up @@ -766,8 +766,8 @@ the NAME. The whole group is prefixed by string INDENT."
(cider-stacktrace-emit-indented (concat str "\n") nil nil t)
(when id
(remove-from-invisibility-spec (cons id t))
(let ((hide-beg (save-excursion (goto-char pos) (point-at-eol)))
(hide-end (1- (point-at-bol))))
(let ((hide-beg (save-excursion (goto-char pos) (line-end-position)))
(hide-end (1- (line-beginning-position))))
(overlay-put (make-overlay hide-beg hide-end) 'invisible id)))))))

(defun cider-stacktrace--emit-spec-problems (spec-data indent)
Expand Down Expand Up @@ -926,7 +926,7 @@ make INSPECT-INDEX actionable if present."

(defun cider-stacktrace-render (buffer causes &optional error-types)
"Emit into BUFFER useful stacktrace information for the CAUSES.
Takes an optional ERROR-TYPES list which will render a 'suppression' toggle
Takes an optional ERROR-TYPES list which will render a `suppression' toggle
that alters the pop-over/pop-under behavorior of the stacktrace buffers
created by these types of errors. The suppressed errors set can be customized
through the `cider-stacktrace-suppressed-errors' variable."
Expand Down
2 changes: 1 addition & 1 deletion lisp/cider-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ N = 1 => 3, N = 2 => 4, etc."

(defun cider-test-ediff ()
"Show diff of the expected vs actual value for the test at point.
With the actual value, the outermost '(not ...)' s-expression is removed."
With the actual value, the outermost `(not ...)' s-expression is removed."
(interactive)
(let* ((expected-buffer (generate-new-buffer " *expected*"))
(actual-buffer (generate-new-buffer " *actual*"))
Expand Down
8 changes: 4 additions & 4 deletions lisp/cider-util.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ Setting this to nil removes the fontification restriction."
(nth 4 (parse-partial-sexp beg (point)))))

(defun cider--tooling-file-p (file-name)
"Return t if FILE-NAME is not a 'real' source file.
Currently, only check if the relative file name starts with 'form-init'
"Return t if FILE-NAME is not a `real' source file.
Copy link
Member

@bbatsov bbatsov Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better not to have quotes here at all.

Currently, only check if the relative file name starts with `form-init'
which nREPL uses for temporary evaluation file names."
(let ((fname (file-name-nondirectory file-name)))
(string-match-p "^form-init" fname)))
Expand Down Expand Up @@ -449,13 +449,13 @@ objects."
candidates))

(defun cider-add-to-alist (symbol car cadr)
"Add '(CAR CADR) to the alist stored in SYMBOL.
"Add \\='(CAR CADR) to the alist stored in SYMBOL.
If CAR already corresponds to an entry in the alist, destructively replace
the entry's second element with CADR.

This can be used, for instance, to update the version of an injected
plugin or dependency with:
(cider-add-to-alist 'cider-jack-in-lein-plugins
(cider-add-to-alist \\='cider-jack-in-lein-plugins
\"plugin/artifact-name\" \"THE-NEW-VERSION\")"
(let ((alist (symbol-value symbol)))
(if-let* ((cons (assoc car alist)))
Expand Down
Loading
Loading