Skip to content
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

Jump to bottom

call cider-docstring--format after checking argument #3722

Merged
merged 3 commits into from
Jul 4, 2024
Merged

call cider-docstring--format after checking argument #3722

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
1f8a041
call cider-docstring--format after checking argument
conao3 Jul 4, 2024
7311fe1
use when-let for DRY
conao3 Jul 4, 2024
1b5de7f
add CHANGELOG entry
conao3 Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- [#3719](https://github.com/clojure-emacs/cider/pull/3719): Remove duplicated keybinding.
- Bump the injected `cider-nrepl` to [0.49.1](https://github.com/clojure-emacs/cider-nrepl/blob/master/CHANGELOG.md#0491-2024-06-30).
- Reduces the minimal supported Clojure version to 1.10.0 (from 1.10.3).
- [#3722](https://github.com/clojure-emacs/cider/pull/3722): Call `cider-docstring--format` after checking argument
Copy link
Member

Choose a reason for hiding this comment

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

That's not the right section of the changelog (1.15.1 was already released). I'll fix the placement myself.


### Bugs fixed

Expand Down
6 changes: 3 additions & 3 deletions cider-eldoc.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ information."
(symbol (lax-plist-get eldoc-info "symbol"))
(docstring (or (cider--render-docstring-first-sentence eldoc-info)
(cider--render-docstring eldoc-info)
(cider-docstring--trim
(cider-docstring--format
(lax-plist-get eldoc-info "docstring")))))
(when-let (docstring (lax-plist-get eldoc-info "docstring"))
(cider-docstring--trim
(cider-docstring--format docstring)))))
;; if it's a single class (and not multiple class candidates), that's it
(maybe-class (car (lax-plist-get eldoc-info "class")))
(formatted-var (or (when maybe-class
Expand Down