Skip to content

Small improvements to lispy-eval #682

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Small improvements to lispy-eval #682

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbc10b0
lispy-eval: improve condition for deciding overlay
lane-s Jul 7, 2024
c7caa4f
Fix display with eros
lane-s Jul 7, 2024
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
16 changes: 9 additions & 7 deletions lispy.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4244,20 +4244,22 @@ When at an outline, eval the outline."
(looking-at lispy-outline-header))
(lispy-eval-outline))
(t
(let ((res (lispy--eval e-str)))
(let ((res (lispy--eval e-str))
(has-cider (or (fboundp 'cider--display-interactive-eval-result)
(require 'cider nil t))))
(when (memq major-mode lispy-clojure-modes)
(setq res (lispy--clojure-pretty-string res)))
(when lispy-eval-output
(setq res (concat lispy-eval-output res)))
(cond ((eq lispy-eval-display-style 'message)
(lispy-message res))
((or (fboundp 'cider--display-interactive-eval-result)
(require 'cider nil t))
(cider--display-interactive-eval-result
res (cdr (lispy--bounds-dwim))))
((or (fboundp 'eros--eval-overlay)
(require 'eros nil t))
((and (or (fboundp 'eros--eval-overlay)
(require 'eros nil t))
(if has-cider (not (memq major-mode lispy-clojure-modes)) t))
(eros--eval-overlay
(read res) (cdr (lispy--bounds-dwim))))
(has-cider
(cider--display-interactive-eval-result
res (cdr (lispy--bounds-dwim))))
(t
(error "Please install CIDER >= 0.10 or eros to display overlay"))))))
Expand Down