emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
doomemacs/modules/tools/eval/config.el

102 lines
3.9 KiB
EmacsLisp
Raw Normal View History

:boom: Remove :feature category :feature was a "catch-all" category. Many of its modules fit better in other categories, so they've been moved: - feature/debugger -> tools/debugger - feature/evil -> editor/evil - feature/eval -> tools/eval - feature/lookup -> tools/lookup - feature/snippets -> editor/snippets - feature/file-templates -> editor/file-templates - feature/workspaces -> ui/workspaces More potential changes in the future: - A new :term category for terminal emulation modules (eshell, term and vterm). - A new :os category for modules dedicated to os-specific functionality. The :tools macos module would fit here, but so would modules for nixos and arch. - A new :services category for web-service integration, like wakatime, twitter, elfeed, gist and pastebin services.
2019-04-21 19:59:44 -04:00
;;; tools/eval/config.el -*- lexical-binding: t; -*-
Add modules/feature/eval (WIP)
2017-02-13 16:57:08 -05:00
Rename +eval-overlay-max-lines -> +eval-popup-min-lines Generalize variable.
2019-10-29 18:17:44 -04:00
(defvar +eval-popup-min-lines 4
tools/eval: add +overlay feature Now, inline evaluation will display results in an overlay next to the cursor, rather than in the minibuffer (unless it gets too big, in which case it'll use a popup buffer).
2019-10-26 01:37:36 -04:00
"The output height threshold (inclusive) before output is displayed in a popup
Rename +eval-overlay-max-lines -> +eval-popup-min-lines Generalize variable.
2019-10-29 18:17:44 -04:00
buffer rather than an overlay on the line at point or the minibuffer.")
tools/eval: add +overlay feature Now, inline evaluation will display results in an overlay next to the cursor, rather than in the minibuffer (unless it gets too big, in which case it'll use a popup buffer).
2019-10-26 01:37:36 -04:00
feature/eval: rewrite module
2017-03-04 18:28:51 -05:00
;; remove ellipsis when printing sexps in message buffer
(setq eval-expression-print-length nil
eval-expression-print-level nil)
Add modules/feature/eval (WIP)
2017-02-13 16:57:08 -05:00
feature/eval: :eval now accepts functions (refactor emacs-lisp eval fn)
2017-05-07 02:27:54 +02:00
feature/eval: reorganize; move settings into init.el
2018-05-14 01:22:33 +02:00
;;
tools/eval: add +overlay feature Now, inline evaluation will display results in an overlay next to the cursor, rather than in the minibuffer (unless it gets too big, in which case it'll use a popup buffer).
2019-10-26 01:37:36 -04:00
;;; Packages
Add modules/feature/eval (WIP)
2017-02-13 16:57:08 -05:00
tools/eval: associate plist with repl handlers Also consolidates all REPLs (opened through the :tools eval module) under one popup rule, which inhibits ESC from prematurely closing them (#1944), and cleans up after their buffers *only* if their handlers weren't specified to :persist, e.g. (set-repl-handler! 'some-mode #'some-repl-handler :persist t) Also standardized ESS's REPL commands.
2019-10-23 21:39:19 -04:00
(set-popup-rule!
(lambda (bufname _)
(when (boundp '+eval-repl-mode)
(buffer-local-value '+eval-repl-mode (get-buffer bufname))))
:ttl (lambda (buf)
(unless (plist-get +eval-repl-plist :persist)
(when-let (process (get-buffer-process buf))
(set-process-query-on-exit-flag process nil)
(kill-process process)
(kill-buffer buf))))
:size 0.25 :quit nil)
feature/eval: minor refactor Now that I've "backported" display-line-numbers to Emacs 25, it isn't necessary to conditionally enable nlinum-mode. Also, use after! isntead of def-package!; this usage is equivalent, and after! imposes less overhead.
2018-10-19 21:58:41 -04:00
(after! quickrun
feature/eval: improve compatibility with feature/popups This makes quickrun, *doom eval* and *Pp Eval Output* buffers behave better. Eval output buffers should a) shrink themselves to the size of their output (within reason), b) *not* grab focus, and c) be easy to close from afar with C-g/Escape. Gotchas: 1. Quickrun gets output asynchronously, so we shrink it on quickrun-after-run-hook, not in the popup rule. 2. *doom eval* and *Pp Eval Output* opens with its output ready, so the popup system may shrink those to fit. 3. *doom eval* and *Pp Eval Output* handle window selection themselves. Let them by setting the select window parameter to #'ignore.
2018-01-08 16:18:16 -05:00
(setq quickrun-focus-p nil)
:boom: Change set-popup-rule! usage Now accepts a flat plist of all its former parameters, including new :parameters and :actions properties to increase your control over the fate of your windows. The old usage of set-popup-rule! is deprecated and may not work right! The :ui popup module has also seen a major refactor to improve efficiency and load times. Sorry! This is the last "big" change before 2.1!
2018-06-18 02:26:05 +02:00
(set-popup-rule! "^\\*quickrun" :size 0.3 :ttl 0)
Add modules/feature/eval (WIP)
2017-02-13 16:57:08 -05:00
def-advice!->defadvice! & conform to new advice conventions This commit does two things: - Renames def-advice! to defadvice!, in the spirit of naming convenience macros after the function/macro they enhance or replace. - Correct the names of advice functions to indicate visibility and intent. A public advice function like doom-set-jump-a is meant to be used elsewhere. A private one like +dired--cleanup-header-line-a shouldn't -- it likely won't work anywhere but the function(s) it was made to advise.
2019-07-23 17:24:56 +02:00
(defadvice! +eval--quickrun-fix-evil-visual-region-a ()
tools/eval: fix eval-and-replace not first clearing selection
2019-05-17 16:01:46 -04:00
"Make `quickrun-replace-region' recognize evil visual selections."
tools/eval: conform to new conventions
2019-07-22 23:29:51 +02:00
:override #'quickrun--outputter-replace-region
tools/eval: fix eval-and-replace not first clearing selection
2019-05-17 16:01:46 -04:00
(let ((output (buffer-substring-no-properties (point-min) (point-max))))
(with-current-buffer quickrun--original-buffer
(cl-destructuring-bind (beg . end)
;; Because `deactivate-mark', the function, was used in
;; `quickrun--region-command-common' instead of `deactivate-mark',
;; the variable, the selection is disabled by this point.
(if (bound-and-true-p evil-local-mode)
(cons evil-visual-beginning evil-visual-end)
(cons (region-beginning) (region-end)))
(delete-region beg end)
(insert output))
(setq quickrun-option-outputter quickrun--original-outputter))))
tools/eval: add +overlay feature Now, inline evaluation will display results in an overlay next to the cursor, rather than in the minibuffer (unless it gets too big, in which case it'll use a popup buffer).
2019-10-26 01:37:36 -04:00
(defadvice! +eval--quickrun-auto-close-a (&rest _)
"Silently re-create the quickrun popup when re-evaluating."
:before '(quickrun quickrun-region)
(when-let (win (get-buffer-window quickrun--buffer-name))
(let ((inhibit-message t))
(quickrun--kill-running-process)
(message ""))
(delete-window win)))
Correct last inline hook defuns See a3e262c7 for rationale
2019-07-28 14:52:59 +02:00
(add-hook! 'quickrun-after-run-hook
tools/eval: conform to new conventions
2019-07-22 23:29:51 +02:00
(defun +eval-quickrun-shrink-window-h ()
"Shrink the quickrun output window once code evaluation is complete."
(when-let (win (get-buffer-window quickrun--buffer-name))
(with-selected-window (get-buffer-window quickrun--buffer-name)
(let ((ignore-window-parameters t))
tools/eval: add +overlay feature Now, inline evaluation will display results in an overlay next to the cursor, rather than in the minibuffer (unless it gets too big, in which case it'll use a popup buffer).
2019-10-26 01:37:36 -04:00
(shrink-window-if-larger-than-buffer)))))
tools/eval: conform to new conventions
2019-07-22 23:29:51 +02:00
(defun +eval-quickrun-scroll-to-bof-h ()
"Ensures window is scrolled to BOF on invocation."
(when-let (win (get-buffer-window quickrun--buffer-name))
(with-selected-window win
tools/eval: add +overlay feature Now, inline evaluation will display results in an overlay next to the cursor, rather than in the minibuffer (unless it gets too big, in which case it'll use a popup buffer).
2019-10-26 01:37:36 -04:00
(goto-char (point-min))))))
tools/eval: make +overlay display errors too
2019-12-22 23:47:54 -05:00
;; Display evaluation results in an overlay at the end of the current line. If
;; the output is more than `+eval-popup-min-lines' (4) lines long, it is
;; displayed in a popup.
refactor: deprecate featurep! for modulep! featurep! will be renamed modulep! in the future, so it's been deprecated. They have identical interfaces, and can be replaced without issue. featurep! was never quite the right name for this macro. It implied that it had some connection to featurep, which it doesn't (only that it was similar in purpose; still, Doom modules are not features). To undo such implications and be consistent with its namespace (and since we're heading into a storm of breaking changes with the v3 release anyway), now was the best opportunity to begin the transition.
2022-08-12 20:29:19 +02:00
(when (modulep! +overlay)
tools/eval: make +overlay display errors too
2019-12-22 23:47:54 -05:00
(defadvice! +eval--show-output-in-overlay-a (fn)
:filter-return #'quickrun--make-sentinel
(lambda (process event)
(funcall fn process event)
(with-current-buffer quickrun--buffer-name
(when (> (buffer-size) 0)
(+eval-display-results
(string-trim (buffer-string))
quickrun--original-buffer)))))
;; Suppress quickrun's popup window because we're using an overlay instead.
tools/eval: add +overlay feature Now, inline evaluation will display results in an overlay next to the cursor, rather than in the minibuffer (unless it gets too big, in which case it'll use a popup buffer).
2019-10-26 01:37:36 -04:00
(defadvice! +eval--inhibit-quickrun-popup-a (buf cb)
:override #'quickrun--pop-to-buffer
(setq quickrun--original-buffer (current-buffer))
tools/eval: make +overlay display errors too
2019-12-22 23:47:54 -05:00
(save-window-excursion
(with-current-buffer (pop-to-buffer buf)
(setq quickrun-option-outputter #'ignore)
(funcall cb))))
;; HACK Without this, `+eval--inhibit-quickrun-popup-a' throws a
;; window-live-p error because no window exists to be recentered!
(advice-add #'quickrun--recenter :override #'ignore)))
tools/eval: add +overlay feature Now, inline evaluation will display results in an overlay next to the cursor, rather than in the minibuffer (unless it gets too big, in which case it'll use a popup buffer).
2019-10-26 01:37:36 -04:00
(use-package! eros
refactor: deprecate featurep! for modulep! featurep! will be renamed modulep! in the future, so it's been deprecated. They have identical interfaces, and can be replaced without issue. featurep! was never quite the right name for this macro. It implied that it had some connection to featurep, which it doesn't (only that it was similar in purpose; still, Doom modules are not features). To undo such implications and be consistent with its namespace (and since we're heading into a storm of breaking changes with the v3 release anyway), now was the best opportunity to begin the transition.
2022-08-12 20:29:19 +02:00
:when (modulep! +overlay)
tools/eval: add +overlay feature Now, inline evaluation will display results in an overlay next to the cursor, rather than in the minibuffer (unless it gets too big, in which case it'll use a popup buffer).
2019-10-26 01:37:36 -04:00
:hook (emacs-lisp-mode . eros-mode))
Reference in a new issue Copy permalink