51d3b1b424
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.
205 lines
8.7 KiB
EmacsLisp
205 lines
8.7 KiB
EmacsLisp
;;; editor/evil/+commands.el -*- lexical-binding: t; -*-
|
|
|
|
(evil-define-operator +evil:open-scratch-buffer (bang)
|
|
(interactive "<!>")
|
|
(doom/open-scratch-buffer bang))
|
|
|
|
(evil-define-command +evil:pwd (bang)
|
|
"Display the current working directory. If BANG, copy it to your clipboard."
|
|
(interactive "<!>")
|
|
(if (not bang)
|
|
(pwd)
|
|
(kill-new default-directory)
|
|
(message "Copied to clipboard")))
|
|
|
|
(evil-define-command +evil:make (arguments &optional bang)
|
|
"Run make with ARGUMENTS.
|
|
If BANG is non-nil, open compilation output in a comint buffer.
|
|
|
|
If BANG, then run ARGUMENTS as a full command. This command understands vim file
|
|
modifiers (like %:p:h). See `+evil-resolve-vim-path-a' for details."
|
|
(interactive "<sh><!>")
|
|
(+evil:compile (format "make %s"
|
|
(evil-ex-replace-special-filenames
|
|
arguments))
|
|
bang))
|
|
|
|
(evil-define-command +evil:compile (arguments &optional bang)
|
|
"Run `compile-command' with ARGUMENTS.
|
|
If BANG is non-nil, open compilation output in a comint buffer.
|
|
|
|
This command understands vim file modifiers (like %:p:h). See
|
|
`+evil-resolve-vim-path-a' for details."
|
|
(interactive "<sh><!>")
|
|
(compile (evil-ex-replace-special-filenames
|
|
(format "%s %s"
|
|
(eval compile-command)
|
|
arguments))
|
|
bang))
|
|
|
|
(evil-define-command +evil:reverse-lines (beg end)
|
|
"Reverse lines between BEG and END."
|
|
(interactive "<r>")
|
|
(reverse-region beg end))
|
|
|
|
(evil-define-command +evil:cd (&optional path)
|
|
"Change `default-directory' with `cd'."
|
|
(interactive "<f>")
|
|
(let ((path (or path "~")))
|
|
(cd path)
|
|
(message "Changed directory to '%s'" (abbreviate-file-name (expand-file-name path)))))
|
|
|
|
(evil-define-command +evil:kill-all-buffers (&optional bang)
|
|
"Kill all buffers. If BANG, kill current session too."
|
|
(interactive "<!>")
|
|
(if (and bang (fboundp '+workspace/kill-session))
|
|
(+workspace/kill-session)
|
|
(doom/kill-all-buffers)))
|
|
|
|
(evil-define-command +evil:kill-matching-buffers (&optional bang pattern)
|
|
"Kill all buffers matching PATTERN regexp. If BANG, only match project
|
|
buffers."
|
|
(interactive "<a>")
|
|
(doom/kill-matching-buffers pattern bang))
|
|
|
|
(evil-define-command +evil:help (&optional bang query)
|
|
"Look up help documentation for QUERY in Emacs documentation.
|
|
|
|
If BANG, search Doom documentation."
|
|
(interactive "<!><a>")
|
|
(if bang
|
|
(doom/help-search query)
|
|
(cond ((or (null query) (string-empty-p (string-trim query)))
|
|
(call-interactively
|
|
(or (command-remapping #'apropos)
|
|
#'apropos)))
|
|
((string-match-p "^ *:[a-z]" query)
|
|
(let* ((modules
|
|
(cl-loop for path in (doom-module-load-path 'all)
|
|
for (cat . mod) = (doom-module-from-path path)
|
|
for format = (format "%s %s" cat mod)
|
|
if (doom-module-p cat mod)
|
|
collect (propertize format 'module (list cat mod))
|
|
else if (and cat mod)
|
|
collect (propertize format
|
|
'face 'font-lock-comment-face
|
|
'module (list cat mod))))
|
|
(module (completing-read "Describe module: " modules nil t query))
|
|
(key (get-text-property 0 'module module)))
|
|
(doom/help-modules key)))
|
|
((and (string-match-p "\\(?:SPC\\|[CMsSH]-[^ ]\\|<[^>]+>\\)" query)
|
|
(helpful-key (kbd (string-trim query)))))
|
|
((apropos query t)))))
|
|
|
|
|
|
;;
|
|
;; Commands
|
|
|
|
;;; Custom commands
|
|
;; Editing
|
|
(evil-ex-define-cmd "@" #'+evil:macro-on-all-lines) ; TODO Test me
|
|
(evil-ex-define-cmd "al[ign]" #'+evil:align)
|
|
(evil-ex-define-cmd "ral[ign]" #'+evil:align-right)
|
|
(evil-ex-define-cmd "enhtml" #'+web:encode-html-entities)
|
|
(evil-ex-define-cmd "dehtml" #'+web:decode-html-entities)
|
|
(evil-ex-define-cmd "mc" #'+multiple-cursors:evil-mc)
|
|
(evil-ex-define-cmd "iedit" #'evil-multiedit-ex-match)
|
|
(evil-ex-define-cmd "na[rrow]" #'+evil:narrow-buffer)
|
|
(evil-ex-define-cmd "retab" #'+evil:retab)
|
|
(evil-ex-define-cmd "rev[erse]" #'+evil:reverse-lines)
|
|
|
|
;;; External resources
|
|
;; TODO (evil-ex-define-cmd "db" #'doom:db)
|
|
;; TODO (evil-ex-define-cmd "dbu[se]" #'doom:db-select)
|
|
;; TODO (evil-ex-define-cmd "go[ogle]" #'doom:google-search)
|
|
(evil-ex-define-cmd "lo[okup]" #'+lookup:online)
|
|
(evil-ex-define-cmd "dash" #'+lookup:dash)
|
|
(evil-ex-define-cmd "http" #'httpd-start) ; start http server
|
|
(evil-ex-define-cmd "repl" #'+eval:repl) ; invoke or send to repl
|
|
(evil-ex-define-cmd "h[elp]" #'+evil:help)
|
|
|
|
;; TODO (evil-ex-define-cmd "rx" 'doom:regex) ; open re-builder
|
|
(evil-ex-define-cmd "sh[ell]" #'+eshell:run)
|
|
(evil-ex-define-cmd "t[mux]" #'+tmux:run) ; send to tmux
|
|
(evil-ex-define-cmd "tcd" #'+tmux:cd-here) ; cd to default-directory in tmux
|
|
(evil-ex-define-cmd "pad" #'+evil:open-scratch-buffer)
|
|
|
|
;;; GIT
|
|
(evil-ex-define-cmd "gist" #'+gist:send) ; send current buffer/region to gist
|
|
(evil-ex-define-cmd "gistl" #'+gist:list) ; list gists by user
|
|
(evil-ex-define-cmd "gbrowse" #'+vc:git-browse) ; show file/region in github/gitlab
|
|
(evil-ex-define-cmd "gissues" #'forge-browse-issues) ; show github issues
|
|
(evil-ex-define-cmd "git" #'magit-status) ; open magit status window
|
|
(evil-ex-define-cmd "gstage" #'magit-stage)
|
|
(evil-ex-define-cmd "gunstage" #'magit-unstage)
|
|
(evil-ex-define-cmd "gblame" #'magit-blame)
|
|
(evil-ex-define-cmd "grevert" #'git-gutter:revert-hunk)
|
|
|
|
;;; Dealing with buffers
|
|
(evil-ex-define-cmd "k[ill]" #'doom/kill-current-buffer)
|
|
(evil-ex-define-cmd "k[ill]all" #'+evil:kill-all-buffers)
|
|
(evil-ex-define-cmd "k[ill]m" #'+evil:kill-matching-buffers)
|
|
(evil-ex-define-cmd "k[ill]o" #'doom/kill-other-buffers)
|
|
(evil-ex-define-cmd "k[ill]b" #'doom/kill-buried-buffers)
|
|
(evil-ex-define-cmd "l[ast]" #'doom/popup-restore)
|
|
(evil-ex-define-cmd "m[sg]" #'view-echo-area-messages)
|
|
(evil-ex-define-cmd "pop[up]" #'doom/popup-this-buffer)
|
|
|
|
;;; Project navigation
|
|
(evil-ex-define-cmd "a" #'projectile-find-other-file)
|
|
(evil-ex-define-cmd "cd" #'+evil:cd)
|
|
(evil-ex-define-cmd "pwd" #'+evil:pwd)
|
|
|
|
(cond ((featurep! :completion ivy)
|
|
(evil-ex-define-cmd "ag" #'+ivy:ag)
|
|
(evil-ex-define-cmd "agc[wd]" #'+ivy:ag-from-cwd)
|
|
(evil-ex-define-cmd "rg" #'+ivy:rg)
|
|
(evil-ex-define-cmd "rgc[wd]" #'+ivy:rg-from-cwd)
|
|
(evil-ex-define-cmd "pt" #'+ivy:pt)
|
|
(evil-ex-define-cmd "ptc[wd]" #'+ivy:pt-from-cwd)
|
|
(evil-ex-define-cmd "grep" #'+ivy:grep)
|
|
(evil-ex-define-cmd "grepc[wd]" #'+ivy:grep-from-cwd)
|
|
(evil-ex-define-cmd "sw[iper]" #'+ivy:swiper)
|
|
(evil-ex-define-cmd "todo" #'+ivy:todo))
|
|
|
|
((featurep! :completion helm)
|
|
(evil-ex-define-cmd "ag" #'+helm:ag)
|
|
(evil-ex-define-cmd "agc[wd]" #'+helm:ag-from-cwd)
|
|
(evil-ex-define-cmd "rg" #'+helm:rg)
|
|
(evil-ex-define-cmd "rgc[wd]" #'+helm:rg-from-cwd)
|
|
(evil-ex-define-cmd "pt" #'+helm:pt)
|
|
(evil-ex-define-cmd "ptc[wd]" #'+helm:pt-from-cwd)
|
|
(evil-ex-define-cmd "grep" #'+helm:grep)
|
|
(evil-ex-define-cmd "grepc[wd]" #'+helm:grep-from-cwd)
|
|
;; (evil-ex-define-cmd "todo" #'+helm:todo) TODO implement `+helm:todo'
|
|
))
|
|
|
|
;;; Project tools
|
|
(evil-ex-define-cmd "compile" #'+evil:compile)
|
|
(evil-ex-define-cmd "mak[e]" #'+evil:make)
|
|
(evil-ex-define-cmd "debug" #'+debugger/start)
|
|
(evil-ex-define-cmd "er[rors]" #'flycheck-list-errors)
|
|
|
|
;;; File operations
|
|
(evil-ex-define-cmd "cp" #'+evil:copy-this-file)
|
|
(evil-ex-define-cmd "mv" #'+evil:move-this-file)
|
|
(evil-ex-define-cmd "rm" #'+evil:delete-this-file)
|
|
|
|
;;; Sessions/tabs
|
|
(evil-ex-define-cmd "sclear" #'+workspace/kill-session)
|
|
(evil-ex-define-cmd "sl[oad]" #'doom/quickload-session)
|
|
(evil-ex-define-cmd "ss[ave]" #'doom/quicksave-session)
|
|
(evil-ex-define-cmd "tabc[lose]" #'+workspace:delete)
|
|
(evil-ex-define-cmd "tabclear" #'doom/kill-all-buffers)
|
|
(evil-ex-define-cmd "tabl[ast]" #'+workspace/switch-to-last)
|
|
(evil-ex-define-cmd "tabload" #'+workspace:load)
|
|
(evil-ex-define-cmd "tabn[ew]" #'+workspace:new)
|
|
(evil-ex-define-cmd "tabn[ext]" #'+workspace:switch-next)
|
|
(evil-ex-define-cmd "tabp[rev]" #'+workspace:switch-previous)
|
|
(evil-ex-define-cmd "tabr[ename]" #'+workspace:rename)
|
|
(evil-ex-define-cmd "tabs" #'+workspace/display)
|
|
(evil-ex-define-cmd "tabsave" #'+workspace:save)
|
|
|
|
;;; Org-mode
|
|
(evil-ex-define-cmd "cap" #'org-capture)
|