2019-04-21 19:59:44 -04:00
|
|
|
;;; tools/eval/autoload/eval.el -*- lexical-binding: t; -*-
|
2017-02-13 16:57:08 -05:00
|
|
|
|
2019-10-26 01:37:36 -04:00
|
|
|
;;;###autoload
|
2019-11-23 00:52:36 -05:00
|
|
|
(defun +eval-display-results-in-popup (output &optional _source-buffer)
|
2019-10-26 01:37:36 -04:00
|
|
|
"Display OUTPUT in a popup buffer."
|
2020-01-07 14:27:02 -05:00
|
|
|
(let ((output-buffer (get-buffer-create "*doom eval*"))
|
|
|
|
(origin (selected-window)))
|
|
|
|
(with-current-buffer output-buffer
|
|
|
|
(setq-local scroll-margin 0)
|
|
|
|
(erase-buffer)
|
|
|
|
(insert output)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if (fboundp '+word-wrap-mode)
|
|
|
|
(+word-wrap-mode +1)
|
|
|
|
(visual-line-mode +1)))
|
|
|
|
(when-let (win (display-buffer output-buffer))
|
|
|
|
(fit-window-to-buffer
|
|
|
|
win (/ (frame-height) 2)
|
|
|
|
nil (/ (frame-width) 2)))
|
|
|
|
(select-window origin)
|
|
|
|
output-buffer))
|
2019-10-26 01:37:36 -04:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun +eval-display-results-in-overlay (output &optional source-buffer)
|
|
|
|
"Display OUTPUT in a floating overlay next to the cursor."
|
2019-10-26 03:53:54 -04:00
|
|
|
(require 'eros)
|
2019-10-26 01:37:36 -04:00
|
|
|
(let ((this-command #'+eval/buffer-or-region)
|
|
|
|
eros-overlays-use-font-lock)
|
|
|
|
(with-current-buffer (or source-buffer (current-buffer))
|
|
|
|
(eros--make-result-overlay output
|
|
|
|
:where (line-end-position)
|
|
|
|
:duration eros-eval-result-duration))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun +eval-display-results (output &optional source-buffer)
|
|
|
|
"Display OUTPUT in an overlay or a popup buffer."
|
2019-10-26 03:53:54 -04:00
|
|
|
(funcall (if (or current-prefix-arg
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert output)
|
2019-12-28 13:53:13 -05:00
|
|
|
(or (>= (count-lines (point-min) (point-max))
|
|
|
|
+eval-popup-min-lines)
|
|
|
|
(>= (string-width
|
|
|
|
(buffer-substring (point-min)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(line-end-position))))
|
|
|
|
(window-width))))
|
2019-10-26 03:53:54 -04:00
|
|
|
(not (require 'eros nil t)))
|
2019-10-26 01:37:36 -04:00
|
|
|
#'+eval-display-results-in-popup
|
|
|
|
#'+eval-display-results-in-overlay)
|
|
|
|
output source-buffer)
|
|
|
|
output)
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
;;; Commands
|
|
|
|
|
2021-02-24 13:45:20 -05:00
|
|
|
(defvar quickrun-option-cmdkey)
|
2017-02-13 16:57:08 -05:00
|
|
|
;;;###autoload
|
2017-03-04 18:28:51 -05:00
|
|
|
(defun +eval/buffer ()
|
2017-02-13 16:57:08 -05:00
|
|
|
"Evaluate the whole buffer."
|
|
|
|
(interactive)
|
2021-02-24 13:45:20 -05:00
|
|
|
(let ((quickrun-option-cmdkey (bound-and-true-p quickrun-option-cmdkey)))
|
|
|
|
(if (or (assq major-mode +eval-runners)
|
|
|
|
(and (fboundp '+eval--ensure-in-repl-buffer)
|
|
|
|
(ignore-errors
|
|
|
|
(get-buffer-window (or (+eval--ensure-in-repl-buffer)
|
|
|
|
t))))
|
|
|
|
(and (require 'quickrun nil t)
|
|
|
|
(equal (setq
|
|
|
|
quickrun-option-cmdkey
|
|
|
|
(quickrun--command-key
|
|
|
|
(buffer-file-name (buffer-base-buffer))))
|
|
|
|
"emacs")
|
|
|
|
(alist-get 'emacs-lisp-mode +eval-runners)))
|
|
|
|
(+eval/region (point-min) (point-max))
|
|
|
|
(quickrun))))
|
2017-02-13 16:57:08 -05:00
|
|
|
|
|
|
|
;;;###autoload
|
2017-03-04 18:28:51 -05:00
|
|
|
(defun +eval/region (beg end)
|
2017-10-03 02:49:08 +02:00
|
|
|
"Evaluate a region between BEG and END and display the output."
|
2017-02-13 16:57:08 -05:00
|
|
|
(interactive "r")
|
|
|
|
(let ((load-file-name buffer-file-name))
|
2021-02-24 13:45:20 -05:00
|
|
|
(cond ((and (fboundp '+eval--ensure-in-repl-buffer)
|
|
|
|
(ignore-errors
|
|
|
|
(get-buffer-window (or (+eval--ensure-in-repl-buffer)
|
|
|
|
t))))
|
|
|
|
(+eval/send-region-to-repl beg end))
|
|
|
|
((let ((runner
|
|
|
|
(or (alist-get major-mode +eval-runners)
|
|
|
|
(and (require 'quickrun nil t)
|
|
|
|
(equal (setq
|
|
|
|
lang (quickrun--command-key
|
|
|
|
(buffer-file-name (buffer-base-buffer))))
|
|
|
|
"emacs")
|
|
|
|
(alist-get 'emacs-lisp-mode +eval-runners))))
|
|
|
|
lang)
|
|
|
|
(if runner
|
|
|
|
(funcall runner beg end)
|
|
|
|
(let ((quickrun-option-cmdkey lang))
|
|
|
|
(quickrun-region beg end))))))))
|
2017-02-13 16:57:08 -05:00
|
|
|
|
2019-03-09 03:28:00 -05:00
|
|
|
;;;###autoload
|
|
|
|
(defun +eval/line-or-region ()
|
|
|
|
"Evaluate the current line or selected region."
|
|
|
|
(interactive)
|
|
|
|
(if (use-region-p)
|
|
|
|
(call-interactively #'+eval/region)
|
|
|
|
(+eval/region (line-beginning-position) (line-end-position))))
|
|
|
|
|
Introduce general.el & rewrite map!
+ Now uses an overriding keymap for leader keys, so that it is always
available, even outside of normal/visual states. In insert/emacs
states, or in sessions where evil is absent, an alternative prefix is
used for leader/localleader keys. See these variables:
+ doom-leader-prefix
+ doom-leader-alt-prefix
+ doom-localleader-prefix
+ doom-localleader-alt-prefix
+ Keybinds now support alternative prefixes through the new :alt-prefix
property. This is useful for non-evil users and non-normal evil
states. By default, this is M-SPC (leader) and M-SPC m (localleader).
+ Removed +evil-commands flag from config/default (moved to
feature/evil/+commands.el).
+ config/default/+bindings.el has been split into
config/default/+{evil,emacs}-bindings.el, which one is loaded depends
on whether evil is present or not. The latter is blank, but will soon
be populated with a keybinding scheme for non-evil users (perhaps
inspired by #641).
+ The define-key! macro has been replaced; it is now an alias for
general-def.
+ Added unmap! as an alias for general-unbind.
+ The following modifier key conventions are now enforced for
consistency, across all OSes:
alt/option = meta
windows/command = super
It used to be
alt/option = alt
windows/command = meta
Many of the default keybinds have been updated to reflect this switch,
but it is likely to affect personal meta/super keybinds!
The map! macro has also been rewritten to use general-define-key. Here
is what has been changed:
+ map! no longer works with characters, e.g. (map! ?x #'do-something) is
no longer supported. Keys must be kbd-able strings like "C-c x" or
vectors like [?C-c ?x].
+ The :map and :map* properties are now the same thing. If specified
keymaps aren't defined when binding keys, it is automatically
deferred.
+ The way you bind local keybinds has changed:
;; Don't do this
(map! :l "a" #'func-a
:l "b" #'func-b)
;; Do this
(map! :map 'local "a" #'func-a
"b" #'func-b)
+ map! now supports the following new blocks:
+ (:if COND THEN-FORM ELSE-FORM...)
+ (:alt-prefix PREFIX KEYS...) -- this prefix will be used for
non-normal evil states. Equivalent to :non-normal-prefix in general.
+ The way you declare a which-key label for a prefix key has changed:
;; before
(map! :desc "label" :prefix "a" ...)
;; now
(map! :prefix ("a" . "label") ...)
+ It used to be that map! supported binding a key to a key sequence,
like so:
(map! "a" [?x]) ; pressing a is like pressing x
This functionality was removed *temporarily* while I figure out the
implementation.
Addresses: #448, #814, #860
Mentioned in: #940
2018-12-22 03:30:04 -05:00
|
|
|
;;;###autoload
|
|
|
|
(defun +eval/buffer-or-region ()
|
|
|
|
"Evaluate the whole buffer."
|
|
|
|
(interactive)
|
|
|
|
(call-interactively
|
|
|
|
(if (use-region-p)
|
|
|
|
#'+eval/region
|
|
|
|
#'+eval/buffer)))
|
|
|
|
|
2017-02-13 16:57:08 -05:00
|
|
|
;;;###autoload
|
2017-03-04 18:28:51 -05:00
|
|
|
(defun +eval/region-and-replace (beg end)
|
2017-10-03 02:49:08 +02:00
|
|
|
"Evaluation a region between BEG and END, and replace it with the result."
|
2017-02-13 16:57:08 -05:00
|
|
|
(interactive "r")
|
2021-02-24 13:45:20 -05:00
|
|
|
(let (lang)
|
|
|
|
(cond
|
|
|
|
((or (eq major-mode 'emacs-lisp-mode)
|
|
|
|
(and (require 'quickrun nil t)
|
|
|
|
(equal (setq
|
|
|
|
lang (quickrun--command-key
|
|
|
|
(buffer-file-name (buffer-base-buffer))))
|
|
|
|
"emacs")))
|
|
|
|
(kill-region beg end)
|
|
|
|
(condition-case nil
|
|
|
|
(prin1 (eval (read (current-kill 0)))
|
|
|
|
(current-buffer))
|
|
|
|
(error (message "Invalid expression")
|
|
|
|
(insert (current-kill 0)))))
|
|
|
|
((let ((quickrun-option-cmdkey lang))
|
|
|
|
(quickrun-replace-region beg end))))))
|