2019-02-18 00:01:58 -05:00
|
|
|
;;; editor/fold/config.el -*- lexical-binding: t; -*-
|
|
|
|
|
|
2019-04-21 19:59:44 -04:00
|
|
|
(when (featurep! :editor evil)
|
2019-02-18 00:01:58 -05:00
|
|
|
;; Add vimish-fold, outline-mode & hideshow support to folding commands
|
|
|
|
|
(define-key! 'global
|
|
|
|
|
[remap evil-toggle-fold] #'+fold/toggle
|
|
|
|
|
[remap evil-close-fold] #'+fold/close
|
|
|
|
|
[remap evil-open-fold] #'+fold/open
|
|
|
|
|
[remap evil-open-fold-rec] #'+fold/open
|
|
|
|
|
[remap evil-close-folds] #'+fold/close-all
|
|
|
|
|
[remap evil-open-folds] #'+fold/open-all)
|
|
|
|
|
(evil-define-key* 'motion 'global
|
|
|
|
|
"zj" #'+fold/next
|
|
|
|
|
"zk" #'+fold/previous))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;; Packages
|
|
|
|
|
|
2019-07-23 12:44:03 +02:00
|
|
|
(use-package! hideshow ; built-in
|
2019-07-23 12:30:47 +02:00
|
|
|
:commands (hs-toggle-hiding
|
|
|
|
|
hs-hide-block
|
|
|
|
|
hs-hide-level
|
|
|
|
|
hs-show-all
|
|
|
|
|
hs-hide-all)
|
2019-02-18 00:01:58 -05:00
|
|
|
:config
|
|
|
|
|
(setq hs-hide-comments-when-hiding-all nil
|
|
|
|
|
;; Nicer code-folding overlays (with fringe indicators)
|
2019-07-23 12:30:47 +02:00
|
|
|
hs-set-up-overlay #'+fold-hideshow-set-up-overlay-fn)
|
2019-02-18 00:01:58 -05:00
|
|
|
|
2019-07-23 17:24:56 +02:00
|
|
|
(defadvice! +fold--hideshow-ensure-mode-a (&rest _)
|
2019-05-15 16:09:53 -04:00
|
|
|
"Ensure `hs-minor-mode' is enabled."
|
: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
|
|
|
:before '(hs-toggle-hiding hs-hide-block hs-hide-level hs-show-all hs-hide-all)
|
2019-05-15 16:09:53 -04:00
|
|
|
(unless (bound-and-true-p hs-minor-mode)
|
|
|
|
|
(hs-minor-mode +1)))
|
|
|
|
|
|
2019-02-18 00:01:58 -05:00
|
|
|
;; extra folding support for more languages
|
|
|
|
|
(unless (assq 't hs-special-modes-alist)
|
|
|
|
|
(setq hs-special-modes-alist
|
|
|
|
|
(append
|
|
|
|
|
'((vimrc-mode "{{{" "}}}" "\"")
|
|
|
|
|
(yaml-mode "\\s-*\\_<\\(?:[^:]+\\)\\_>"
|
|
|
|
|
""
|
|
|
|
|
"#"
|
2019-07-23 12:30:47 +02:00
|
|
|
+fold-hideshow-forward-block-by-indent-fn nil)
|
|
|
|
|
(haml-mode "[#.%]" "\n" "/" +fold-hideshow-haml-forward-sexp-fn nil)
|
2019-02-18 00:01:58 -05:00
|
|
|
(ruby-mode "class\\|d\\(?:ef\\|o\\)\\|module\\|[[{]"
|
|
|
|
|
"end\\|[]}]"
|
|
|
|
|
"#\\|=begin"
|
|
|
|
|
ruby-forward-sexp)
|
|
|
|
|
(enh-ruby-mode "class\\|d\\(?:ef\\|o\\)\\|module\\|[[{]"
|
|
|
|
|
"end\\|[]}]"
|
|
|
|
|
"#\\|=begin"
|
|
|
|
|
enh-ruby-forward-sexp nil)
|
|
|
|
|
(matlab-mode "if\\|switch\\|case\\|otherwise\\|while\\|for\\|try\\|catch"
|
|
|
|
|
"end"
|
2019-05-16 01:22:50 -04:00
|
|
|
nil (lambda (_arg) (matlab-forward-sexp)))
|
|
|
|
|
(nxml-mode "<!--\\|<[^/>]*[^/]>"
|
|
|
|
|
"-->\\|</[^/>]*[^/]>"
|
|
|
|
|
"<!--" sgml-skip-tag-forward nil))
|
2019-02-18 00:01:58 -05:00
|
|
|
hs-special-modes-alist
|
|
|
|
|
'((t))))))
|
|
|
|
|
|
|
|
|
|
|
2019-07-23 12:44:03 +02:00
|
|
|
(use-package! evil-vimish-fold
|
2019-04-21 19:59:44 -04:00
|
|
|
:when (featurep! :editor evil)
|
2019-02-18 00:01:58 -05:00
|
|
|
:commands (evil-vimish-fold/next-fold evil-vimish-fold/previous-fold
|
|
|
|
|
evil-vimish-fold/delete evil-vimish-fold/delete-all
|
|
|
|
|
evil-vimish-fold/create evil-vimish-fold/create-line)
|
|
|
|
|
:init
|
|
|
|
|
(setq vimish-fold-dir (concat doom-cache-dir "vimish-fold/")
|
|
|
|
|
vimish-fold-indication-mode 'right-fringe)
|
|
|
|
|
(evil-define-key* 'motion 'global
|
|
|
|
|
"zf" #'evil-vimish-fold/create
|
|
|
|
|
"zF" #'evil-vimish-fold/create-line
|
|
|
|
|
"zd" #'vimish-fold-delete
|
|
|
|
|
"zE" #'vimish-fold-delete-all)
|
|
|
|
|
:config
|
|
|
|
|
(vimish-fold-global-mode +1))
|