82ae3a73f3
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.
79 lines
2.9 KiB
EmacsLisp
79 lines
2.9 KiB
EmacsLisp
;;; editor/fold/config.el -*- lexical-binding: t; -*-
|
|
|
|
(when (featurep! :editor evil)
|
|
;; 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
|
|
|
|
(use-package! hideshow ; built-in
|
|
:commands (hs-toggle-hiding
|
|
hs-hide-block
|
|
hs-hide-level
|
|
hs-show-all
|
|
hs-hide-all)
|
|
:config
|
|
(setq hs-hide-comments-when-hiding-all nil
|
|
;; Nicer code-folding overlays (with fringe indicators)
|
|
hs-set-up-overlay #'+fold-hideshow-set-up-overlay-fn)
|
|
|
|
(defadvice! +fold--hideshow-ensure-mode-a (&rest _)
|
|
"Ensure `hs-minor-mode' is enabled."
|
|
:before '(hs-toggle-hiding hs-hide-block hs-hide-level hs-show-all hs-hide-all)
|
|
(unless (bound-and-true-p hs-minor-mode)
|
|
(hs-minor-mode +1)))
|
|
|
|
;; extra folding support for more languages
|
|
(unless (assq 't hs-special-modes-alist)
|
|
(setq hs-special-modes-alist
|
|
(append
|
|
'((vimrc-mode "{{{" "}}}" "\"")
|
|
(yaml-mode "\\s-*\\_<\\(?:[^:]+\\)\\_>"
|
|
""
|
|
"#"
|
|
+fold-hideshow-forward-block-by-indent-fn nil)
|
|
(haml-mode "[#.%]" "\n" "/" +fold-hideshow-haml-forward-sexp-fn nil)
|
|
(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"
|
|
nil (lambda (_arg) (matlab-forward-sexp)))
|
|
(nxml-mode "<!--\\|<[^/>]*[^/]>"
|
|
"-->\\|</[^/>]*[^/]>"
|
|
"<!--" sgml-skip-tag-forward nil))
|
|
hs-special-modes-alist
|
|
'((t))))))
|
|
|
|
|
|
(use-package! evil-vimish-fold
|
|
:when (featurep! :editor evil)
|
|
: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))
|