emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

core-keybinds: refactor

Browse source
This commit is contained in:
Henrik Lissner 2017-05-16 17:40:26 +02:00
parent b679a86452
commit b2d8ddd322
1 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

65
core/core-keybinds.el
View file

@ -1,6 +1,8 @@
;;; core-keybinds.el ;;; core-keybinds.el
;; A centralized keybinds system. Uses `which-key' to preview available keys. ;; A centralized keybinds system, integrated with `which-key' to preview
;; available keys, and `evil', if it's enabled. All built into one powerful
;; macro: `map!'.
(defvar doom-leader-key "," (defvar doom-leader-key ","
"The leader prefix key, for global commands.") "The leader prefix key, for global commands.")
@ -8,7 +10,18 @@
(defvar doom-localleader-key "\\" (defvar doom-localleader-key "\\"
"The leader prefix key, for global commands.") "The leader prefix key, for global commands.")
(defvar doom-evil-state-alist
'(("n" . normal)
("v" . visual)
("i" . insert)
("e" . emacs)
("o" . operator)
("m" . motion)
("r" . replace))
"A list of cons cells that map a letter to a evil state symbol.")
;;
(def-package! which-key (def-package! which-key
:demand t :demand t
:config :config
@ -28,31 +41,35 @@
(which-key-mode +1)) (which-key-mode +1))
(defun doom-keybind-register (key desc &optional modes) ;;
"TODO" (defun doom--keybind-register (key desc &optional modes)
"Register a description for KEY with `which-key' in MODES.
KEYS should be a string in kbd format.
DESC should be a string describing what KEY does.
MODES should be a list of major mode symbols."
(if modes (if modes
(dolist (mode modes) (dolist (mode modes)
(which-key-add-major-mode-key-based-replacements mode key desc)) (which-key-add-major-mode-key-based-replacements mode key desc))
(which-key-add-key-based-replacements key desc))) (which-key-add-key-based-replacements key desc)))
(defun doom-keyword-to-states (keyword &optional ignore) (defun doom--keyword-to-states (keyword &optional ignore)
"TODO" "Convert a KEYWORD into a list of evil state symbols.
(let ((states '(("n" . normal)
("v" . visual) IGNORE is a list of keyword letters that should be ignored.
("i" . insert)
("e" . emacs) For example, :nvi will map to (list 'normal 'visual 'insert). See
("o" . operator) `doom-evil-state-alist' to customize this."
("m" . motion) (delq nil
("r" . replace)))) (mapcar (lambda (l)
(delq nil (let ((state (cdr (assoc l doom-evil-state-alist))))
(mapcar (lambda (l) (unless state
(let ((state (cdr (assoc l states)))) (unless (or (eq ignore t) (member l ignore))
(unless state (error "not a valid state: %s" l)))
(unless (or (eq ignore t) (member l ignore)) state))
(error "not a valid state: %s" l))) (split-string (substring (symbol-name keyword) 1) "" t))))
state))
(split-string (substring (symbol-name keyword) 1) "" t)))))
;; Register keywords for proper indentation (see `map!') ;; Register keywords for proper indentation (see `map!')
(put ':prefix 'lisp-indent-function 'defun) (put ':prefix 'lisp-indent-function 'defun)
@ -90,6 +107,8 @@ States
If states are omitted the keybind will be global. If states are omitted the keybind will be global.
This can be customized with `doom-evil-state-alist'.
:L cannot be in a :map. :L cannot be in a :map.
Flags Flags
@ -158,12 +177,12 @@ Example
`(vconcat ,prefix (if (stringp ,def) (kbd ,def) ,def)) `(vconcat ,prefix (if (stringp ,def) (kbd ,def) ,def))
`(vconcat ,prefix ,(if (stringp def) (kbd def) def)))) `(vconcat ,prefix ,(if (stringp def) (kbd def) def))))
(when desc (when desc
(push `(doom-keybind-register ,(key-description (eval prefix)) (push `(doom--keybind-register ,(key-description (eval prefix))
,desc ',modes) ,desc ',modes)
forms) forms)
(setq desc nil)))) (setq desc nil))))
(otherwise ; might be a state prefix (otherwise ; might be a state prefix
(setq states (doom-keyword-to-states key '("L"))) (setq states (doom--keyword-to-states key '("L")))
(when (let (case-fold-search) (when (let (case-fold-search)
(string-match-p "L" (symbol-name key))) (string-match-p "L" (symbol-name key)))
(setq local t) (setq local t)
@ -186,7 +205,7 @@ Example
(user-error "map! has no definition for %s key" key)) (user-error "map! has no definition for %s key" key))
(setq def (pop rest)) (setq def (pop rest))
(when desc (when desc
(push `(doom-keybind-register ,(key-description (eval key)) (push `(doom--keybind-register ,(key-description (eval key))
,desc ',modes) ,desc ',modes)
forms)) forms))
(cond ((and keymaps states) (cond ((and keymaps states)