2019-04-21 19:59:44 -04:00
|
|
|
;;; editor/evil/autoload/advice.el -*- lexical-binding: t; -*-
|
2018-09-07 22:02:41 -04:00
|
|
|
|
|
|
|
|
;;;###autoload
|
:boom: revise advice naming convention (1/2)
This is first of three big naming convention updates that have been a
long time coming. With 2.1 on the horizon, all the breaking updates will
batched together in preparation for the long haul.
In this commit, we do away with the asterix to communicate that a
function is an advice function, and we replace it with the '-a' suffix.
e.g.
doom*shut-up -> doom-shut-up-a
doom*recenter -> doom-recenter-a
+evil*static-reindent -> +evil--static-reindent-a
The rationale behind this change is:
1. Elisp's own formatting/indenting tools would occasionally struggle
with | and * (particularly pp and cl-prettyprint). They have no
problem with / and :, fortunately.
2. External syntax highlighters (like pygmentize, discord markdown or
github markdown) struggle with it, sometimes refusing to highlight
code beyond these symbols.
3. * and | are less expressive than - and -- in communicating the
intended visibility, versatility and stability of a function.
4. It complicated the regexps we must use to search for them.
5. They were arbitrary and over-complicated to begin with, decided
on haphazardly way back when Doom was simply "my private config".
Anyhow, like how predicate functions have the -p suffix, we'll adopt the
-a suffix for advice functions, -h for hook functions and -fn for
variable functions.
Other noteable changes:
- Replaces advice-{add,remove}! macro with new def-advice!
macro. The old pair weren't as useful. The new def-advice! saves on a
lot of space.
- Removed "stage" assertions to make sure you were using the right
macros in the right place. Turned out to not be necessary, we'll
employ better checks later.
2019-07-18 15:42:52 +02:00
|
|
|
(defun +evil-escape-a (&rest _)
|
|
|
|
|
"Call `doom/escape' if `evil-force-normal-state' is called interactively."
|
|
|
|
|
(when (called-interactively-p 'any)
|
|
|
|
|
(call-interactively #'doom/escape)))
|
2018-09-07 22:02:41 -04:00
|
|
|
|
|
|
|
|
;;;###autoload
|
:boom: revise advice naming convention (1/2)
This is first of three big naming convention updates that have been a
long time coming. With 2.1 on the horizon, all the breaking updates will
batched together in preparation for the long haul.
In this commit, we do away with the asterix to communicate that a
function is an advice function, and we replace it with the '-a' suffix.
e.g.
doom*shut-up -> doom-shut-up-a
doom*recenter -> doom-recenter-a
+evil*static-reindent -> +evil--static-reindent-a
The rationale behind this change is:
1. Elisp's own formatting/indenting tools would occasionally struggle
with | and * (particularly pp and cl-prettyprint). They have no
problem with / and :, fortunately.
2. External syntax highlighters (like pygmentize, discord markdown or
github markdown) struggle with it, sometimes refusing to highlight
code beyond these symbols.
3. * and | are less expressive than - and -- in communicating the
intended visibility, versatility and stability of a function.
4. It complicated the regexps we must use to search for them.
5. They were arbitrary and over-complicated to begin with, decided
on haphazardly way back when Doom was simply "my private config".
Anyhow, like how predicate functions have the -p suffix, we'll adopt the
-a suffix for advice functions, -h for hook functions and -fn for
variable functions.
Other noteable changes:
- Replaces advice-{add,remove}! macro with new def-advice!
macro. The old pair weren't as useful. The new def-advice! saves on a
lot of space.
- Removed "stage" assertions to make sure you were using the right
macros in the right place. Turned out to not be necessary, we'll
employ better checks later.
2019-07-18 15:42:52 +02:00
|
|
|
(defun +evil-resolve-vim-path-a (file-name)
|
2018-09-07 22:02:41 -04:00
|
|
|
"Take a path and resolve any vim-like filename modifiers in it. This adds
|
|
|
|
|
support for most vim file modifiers, as well as:
|
|
|
|
|
|
|
|
|
|
%:P Resolves to `doom-project-root'.
|
|
|
|
|
|
|
|
|
|
See http://vimdoc.sourceforge.net/htmldoc/cmdline.html#filename-modifiers for
|
|
|
|
|
more information on modifiers."
|
|
|
|
|
(let* (case-fold-search
|
|
|
|
|
(regexp (concat "\\(?:^\\|[^\\\\]\\)"
|
|
|
|
|
"\\([#%]\\)"
|
|
|
|
|
"\\(\\(?::\\(?:[PphtreS~.]\\|g?s[^:\t\n ]+\\)\\)*\\)"))
|
|
|
|
|
(matches
|
|
|
|
|
(cl-loop with i = 0
|
|
|
|
|
while (and (< i (length file-name))
|
|
|
|
|
(string-match regexp file-name i))
|
|
|
|
|
do (setq i (1+ (match-beginning 0)))
|
|
|
|
|
and collect
|
|
|
|
|
(cl-loop for j to (/ (length (match-data)) 2)
|
|
|
|
|
collect (match-string j file-name)))))
|
|
|
|
|
(dolist (match matches)
|
|
|
|
|
(let ((flags (split-string (car (cdr (cdr match))) ":" t))
|
|
|
|
|
(path (and buffer-file-name
|
|
|
|
|
(pcase (car (cdr match))
|
|
|
|
|
("%" (file-relative-name buffer-file-name))
|
|
|
|
|
("#" (save-excursion (other-window 1) (file-relative-name buffer-file-name))))))
|
|
|
|
|
flag global)
|
|
|
|
|
(if (not path)
|
|
|
|
|
(setq path "")
|
|
|
|
|
(while flags
|
|
|
|
|
(setq flag (pop flags))
|
|
|
|
|
(when (string-suffix-p "\\" flag)
|
|
|
|
|
(setq flag (concat flag (pop flags))))
|
|
|
|
|
(when (string-prefix-p "gs" flag)
|
|
|
|
|
(setq global t
|
|
|
|
|
flag (substring flag 1)))
|
|
|
|
|
(setq path
|
|
|
|
|
(or (pcase (substring flag 0 1)
|
|
|
|
|
("p" (expand-file-name path))
|
|
|
|
|
("~" (concat "~/" (file-relative-name path "~")))
|
|
|
|
|
("." (file-relative-name path default-directory))
|
|
|
|
|
("t" (file-name-nondirectory (directory-file-name path)))
|
|
|
|
|
("r" (file-name-sans-extension path))
|
|
|
|
|
("e" (file-name-extension path))
|
|
|
|
|
("S" (shell-quote-argument path))
|
|
|
|
|
("h"
|
|
|
|
|
(let ((parent (file-name-directory (expand-file-name path))))
|
|
|
|
|
(unless (equal (file-truename path)
|
|
|
|
|
(file-truename parent))
|
|
|
|
|
(if (file-name-absolute-p path)
|
|
|
|
|
(directory-file-name parent)
|
|
|
|
|
(file-relative-name parent)))))
|
|
|
|
|
("s"
|
|
|
|
|
(if (featurep 'evil)
|
2019-06-25 21:38:16 +02:00
|
|
|
(when-let (args (evil-delimited-arguments (substring flag 1) 2))
|
2018-09-07 22:02:41 -04:00
|
|
|
(let ((pattern (evil-transform-vim-style-regexp (car args)))
|
|
|
|
|
(replace (cadr args)))
|
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
(if global pattern (concat "\\(" pattern "\\).*\\'"))
|
|
|
|
|
(evil-transform-vim-style-regexp replace) path t t
|
|
|
|
|
(unless global 1))))
|
|
|
|
|
path))
|
|
|
|
|
("P"
|
2018-12-05 19:17:40 -05:00
|
|
|
(let ((project-root (doom-project-root (file-name-directory (expand-file-name path)))))
|
2018-10-19 23:27:58 -04:00
|
|
|
(unless project-root
|
|
|
|
|
(user-error "Not in a project"))
|
|
|
|
|
(abbreviate-file-name project-root)))
|
2018-09-07 22:02:41 -04:00
|
|
|
(_ path))
|
|
|
|
|
"")))
|
|
|
|
|
;; strip trailing slash, if applicable
|
|
|
|
|
(when (and (not (string= path "")) (equal (substring path -1) "/"))
|
|
|
|
|
(setq path (substring path 0 -1))))
|
|
|
|
|
(setq file-name
|
|
|
|
|
(replace-regexp-in-string (format "\\(?:^\\|[^\\\\]\\)\\(%s\\)"
|
|
|
|
|
(regexp-quote (string-trim-left (car match))))
|
|
|
|
|
path file-name t t 1))))
|
|
|
|
|
(replace-regexp-in-string regexp "\\1" file-name t)))
|
|
|
|
|
|
:boom: revise advice naming convention (1/2)
This is first of three big naming convention updates that have been a
long time coming. With 2.1 on the horizon, all the breaking updates will
batched together in preparation for the long haul.
In this commit, we do away with the asterix to communicate that a
function is an advice function, and we replace it with the '-a' suffix.
e.g.
doom*shut-up -> doom-shut-up-a
doom*recenter -> doom-recenter-a
+evil*static-reindent -> +evil--static-reindent-a
The rationale behind this change is:
1. Elisp's own formatting/indenting tools would occasionally struggle
with | and * (particularly pp and cl-prettyprint). They have no
problem with / and :, fortunately.
2. External syntax highlighters (like pygmentize, discord markdown or
github markdown) struggle with it, sometimes refusing to highlight
code beyond these symbols.
3. * and | are less expressive than - and -- in communicating the
intended visibility, versatility and stability of a function.
4. It complicated the regexps we must use to search for them.
5. They were arbitrary and over-complicated to begin with, decided
on haphazardly way back when Doom was simply "my private config".
Anyhow, like how predicate functions have the -p suffix, we'll adopt the
-a suffix for advice functions, -h for hook functions and -fn for
variable functions.
Other noteable changes:
- Replaces advice-{add,remove}! macro with new def-advice!
macro. The old pair weren't as useful. The new def-advice! saves on a
lot of space.
- Removed "stage" assertions to make sure you were using the right
macros in the right place. Turned out to not be necessary, we'll
employ better checks later.
2019-07-18 15:42:52 +02:00
|
|
|
(defun +evil--insert-newline (&optional above _noextranewline)
|
|
|
|
|
(let ((pos (save-excursion (beginning-of-line-text) (point)))
|
|
|
|
|
comment-auto-fill-only-comments)
|
|
|
|
|
(require 'smartparens)
|
|
|
|
|
(evil-narrow-to-field
|
|
|
|
|
(if above
|
|
|
|
|
(if (save-excursion (nth 4 (sp--syntax-ppss pos)))
|
|
|
|
|
(evil-save-goal-column
|
|
|
|
|
(setq evil-auto-indent nil)
|
|
|
|
|
(goto-char pos)
|
|
|
|
|
(let ((ws (abs (skip-chars-backward " \t"))))
|
|
|
|
|
;; FIXME oh god why
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if comment-line-break-function
|
|
|
|
|
(funcall comment-line-break-function)
|
|
|
|
|
(comment-indent-new-line))
|
|
|
|
|
(when (and (derived-mode-p 'c-mode 'c++-mode 'objc-mode 'java-mode 'js2-mode)
|
|
|
|
|
(eq (char-after) ?/))
|
|
|
|
|
(insert "*"))
|
|
|
|
|
(insert
|
|
|
|
|
(make-string (max 0 (+ ws (skip-chars-backward " \t")))
|
|
|
|
|
32)))
|
|
|
|
|
(insert (make-string (max 1 ws) 32))))
|
|
|
|
|
(evil-move-beginning-of-line)
|
|
|
|
|
(insert (if use-hard-newlines hard-newline "\n"))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(back-to-indentation))
|
|
|
|
|
(evil-move-end-of-line)
|
|
|
|
|
(cond ((sp-point-in-comment pos)
|
|
|
|
|
(setq evil-auto-indent nil)
|
|
|
|
|
(if comment-line-break-function
|
|
|
|
|
(funcall comment-line-break-function)
|
|
|
|
|
(comment-indent-new-line)))
|
|
|
|
|
;; TODO Find a better way to do this
|
|
|
|
|
((and (eq major-mode 'haskell-mode)
|
|
|
|
|
(fboundp 'haskell-indentation-newline-and-indent))
|
|
|
|
|
(setq evil-auto-indent nil)
|
|
|
|
|
(haskell-indentation-newline-and-indent))
|
|
|
|
|
(t
|
|
|
|
|
(insert (if use-hard-newlines hard-newline "\n"))
|
|
|
|
|
(back-to-indentation)))))))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun +evil--insert-newline-below-and-respect-comments-a (orig-fn count)
|
|
|
|
|
(if (or (not +evil-want-o/O-to-continue-comments)
|
|
|
|
|
(not (eq this-command 'evil-open-below))
|
|
|
|
|
(evil-insert-state-p))
|
|
|
|
|
(funcall orig-fn count)
|
|
|
|
|
(cl-letf (((symbol-function 'evil-insert-newline-below)
|
|
|
|
|
(lambda () (+evil--insert-newline))))
|
|
|
|
|
(let ((evil-auto-indent evil-auto-indent))
|
|
|
|
|
(funcall orig-fn count)))))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun +evil--insert-newline-above-and-respect-comments-a (orig-fn count)
|
|
|
|
|
(if (or (not +evil-want-o/O-to-continue-comments)
|
|
|
|
|
(not (eq this-command 'evil-open-above))
|
|
|
|
|
(evil-insert-state-p))
|
|
|
|
|
(funcall orig-fn count)
|
|
|
|
|
(cl-letf (((symbol-function 'evil-insert-newline-above)
|
|
|
|
|
(lambda () (+evil--insert-newline 'above))))
|
|
|
|
|
(let ((evil-auto-indent evil-auto-indent))
|
|
|
|
|
(funcall orig-fn count)))))
|
|
|
|
|
|
|
|
|
|
;;;###autoload (autoload '+evil-window-split-a "editor/evil/autoload/advice" nil t)
|
|
|
|
|
(evil-define-command +evil-window-split-a (&optional count file)
|
2018-09-07 22:02:41 -04:00
|
|
|
"Same as `evil-window-split', but focuses (and recenters) the new split."
|
|
|
|
|
:repeat nil
|
|
|
|
|
(interactive "P<f>")
|
2019-10-28 23:04:12 -04:00
|
|
|
(let ((win (selected-window)))
|
|
|
|
|
(split-window (selected-window) count
|
|
|
|
|
(if evil-split-window-below 'above 'below))
|
|
|
|
|
(select-window win))
|
2018-09-07 22:02:41 -04:00
|
|
|
(recenter)
|
|
|
|
|
(when (and (not count) evil-auto-balance-windows)
|
|
|
|
|
(balance-windows (window-parent)))
|
|
|
|
|
(if file (evil-edit file)))
|
|
|
|
|
|
:boom: revise advice naming convention (1/2)
This is first of three big naming convention updates that have been a
long time coming. With 2.1 on the horizon, all the breaking updates will
batched together in preparation for the long haul.
In this commit, we do away with the asterix to communicate that a
function is an advice function, and we replace it with the '-a' suffix.
e.g.
doom*shut-up -> doom-shut-up-a
doom*recenter -> doom-recenter-a
+evil*static-reindent -> +evil--static-reindent-a
The rationale behind this change is:
1. Elisp's own formatting/indenting tools would occasionally struggle
with | and * (particularly pp and cl-prettyprint). They have no
problem with / and :, fortunately.
2. External syntax highlighters (like pygmentize, discord markdown or
github markdown) struggle with it, sometimes refusing to highlight
code beyond these symbols.
3. * and | are less expressive than - and -- in communicating the
intended visibility, versatility and stability of a function.
4. It complicated the regexps we must use to search for them.
5. They were arbitrary and over-complicated to begin with, decided
on haphazardly way back when Doom was simply "my private config".
Anyhow, like how predicate functions have the -p suffix, we'll adopt the
-a suffix for advice functions, -h for hook functions and -fn for
variable functions.
Other noteable changes:
- Replaces advice-{add,remove}! macro with new def-advice!
macro. The old pair weren't as useful. The new def-advice! saves on a
lot of space.
- Removed "stage" assertions to make sure you were using the right
macros in the right place. Turned out to not be necessary, we'll
employ better checks later.
2019-07-18 15:42:52 +02:00
|
|
|
;;;###autoload (autoload '+evil-window-vsplit-a "editor/evil/autoload/advice" nil t)
|
|
|
|
|
(evil-define-command +evil-window-vsplit-a (&optional count file)
|
2018-09-07 22:02:41 -04:00
|
|
|
"Same as `evil-window-vsplit', but focuses (and recenters) the new split."
|
|
|
|
|
:repeat nil
|
|
|
|
|
(interactive "P<f>")
|
2019-10-28 23:04:12 -04:00
|
|
|
(let ((win (selected-window)))
|
|
|
|
|
(split-window (selected-window) count
|
|
|
|
|
(if evil-vsplit-window-right 'left 'right))
|
|
|
|
|
(select-window win))
|
2018-09-07 22:02:41 -04:00
|
|
|
(recenter)
|
|
|
|
|
(when (and (not count) evil-auto-balance-windows)
|
|
|
|
|
(balance-windows (window-parent)))
|
|
|
|
|
(if file (evil-edit file)))
|
|
|
|
|
|
2019-03-04 20:42:04 -05:00
|
|
|
;;;###autoload
|
2019-07-18 15:27:20 +02:00
|
|
|
(defun +evil--fix-dabbrev-in-minibuffer-h ()
|
2019-03-04 20:42:04 -05:00
|
|
|
"Make `try-expand-dabbrev' from `hippie-expand' work in minibuffer. See
|
|
|
|
|
`he-dabbrev-beg', so we need to redefine syntax for '/'."
|
|
|
|
|
(set-syntax-table (let* ((table (make-syntax-table)))
|
|
|
|
|
(modify-syntax-entry ?/ "." table)
|
|
|
|
|
table)))
|