Recognize defn- in clojure-find-def for declarations

[SophieBosio]

This PR expands on the work of #682.

The problem is that when running cider-find-def with point inside the following function,

(defn- foo [x] x)

it would not recognize defn- as the first symbol. Instead it would output ("defn" "-"). I would expect it to output ("defn-" "foo").

This stems from the regex for declarations in clojure-def-type-and-name-regex:

clojure-mode/clojure-mode.el

Line 2269 in 63356ee

"\\(def\\(?:\\sw\\|\\s_\\)*\\)\\>"

It recognizes def followed by an entry from the word class w or from the symbol class _, but it also states that the end must be from the "comment end" class >. The hyphen is not included in this class and therefore can't be the final character in the recognized expression.

My suggested fix is to recognize an optional hyphen at the end.

It still recognizes def-n and now also def-n-

I added a few test cases to the ones added by @frwdrik.

Emacs version:
GNU Emacs 30.0.92 (build 2, aarch64-apple-darwin24.1.0, NS appkit-2575.20 Version 15.1 (Build 24B83)) of 2024-11-01

clojure-mode version:
clojure-mode (version 5.20.0-snapshot)

---

Before submitting a PR mark the checkboxes for the items you've done (if you
think a checkbox does not apply, then leave it unchecked):

• The commits are consistent with our contribution guidelines.
• You've added tests (if possible) to cover your change(s). Bugfix, indentation, and font-lock tests are extremely important!
• You've run M-x checkdoc and fixed any warnings in the code you've written.
• You've updated the changelog (if adding/changing user-visible functionality).
• You've updated the readme (if adding/changing user-visible functionality).

Thanks!

[bbatsov]

Probably you should also add a couple of tests showing that anything like defxyz- will be accepted, so it's clearer that the - will work for every definition form.

[bbatsov]

I think this test should be under a different it group.

[bbatsov]

Thanks for the detailed description of the problem and the proposed solution!

Outside of my small remark about adding some extra tests - your proposed changes look good to me. Also - please mention your fix in the changelog.

P.S. It's always nice to see a first-time contributor to the project!

[SophieBosio]

Thanks for the detailed description of the problem and the proposed solution!

Outside of my small remark about adding some extra tests - your proposed changes look good to me. Also - please mention your fix in the changelog.

P.S. It's always nice to see a first-time contributor to the project!

My pleasure! It's my first-ever open source contribution, so thank you for the feedback and for the helpful contribution guide!

Please let this newbie know if there's anything else I can improve 😊

[bbatsov]

Everything looks great now! Just rebase your branch on top of master to address the conflict in the changelog.

My pleasure! It's my first-ever open source contribution, so thank you for the feedback and for the helpful contribution guide!

Hopefully the first of many! 🚀

[SophieBosio]

Everything looks great now! Just rebase your branch on top of master to address the conflict in the changelog.

My pleasure! It's my first-ever open source contribution, so thank you for the feedback and for the helpful contribution guide!

Hopefully the first of many! 🚀

Glad to hear it! ❤ Thanks to you and to @frwdrik!