TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make key names more coherent

This commit is contained in:
JAremko 2020-03-07 17:36:17 +02:00 committed by Eugene Yaremenko
parent 7d177d4e66
commit 130f00e4f3
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-spacebind.el
View File

@ -30,7 +30,7 @@ Otherwise binding happens at the next event loop.")
"Binding stack for `spacemacs/set-leader-keys-for-major-mode'.") "Binding stack for `spacemacs/set-leader-keys-for-major-mode'.")
(defvar spacebind--bs-set-leader-keys-for-minor-mode '() (defvar spacebind--bs-set-leader-keys-for-minor-mode '()
"Binding stack for `spacemacs/set-leader-keys-for-minor-mode'.") "Binding stack for `spacemacs/set-leader-keys-for-minor-mode'.")
(defvar spacebind--bs-add-global-replacements '() (defvar spacebind--bs-global-replacements '()
"Binding stack for `which-key-add-key-based-replacements'.") "Binding stack for `which-key-add-key-based-replacements'.")
(defvar spacebind--timer [t] (defvar spacebind--timer [t]
@ -94,7 +94,7 @@ Otherwise binding happens at the next event loop.")
(spacemacs/set-leader-keys-for-minor-mode mode keys fn-sym))) (spacemacs/set-leader-keys-for-minor-mode mode keys fn-sym)))
;; `which-key-add-key-based-replacements' ;; `which-key-add-key-based-replacements'
(dolist (args spacebind--bs-add-global-replacements) (dolist (args spacebind--bs-global-replacements)
(let ((keys (string-join (append `(,(spacemacs/leader-key)) (let ((keys (string-join (append `(,(spacemacs/leader-key))
(car args)) (car args))
" ")) " "))
@ -102,7 +102,7 @@ Otherwise binding happens at the next event loop.")
(which-key-add-key-based-replacements keys label)))) (which-key-add-key-based-replacements keys label))))
;; Reset stacks ;; Reset stacks
(setq spacebind--bs-add-global-replacements nil (setq spacebind--bs-global-replacements nil
spacebind--bs-set-leader-keys-for-minor-mode nil spacebind--bs-set-leader-keys-for-minor-mode nil
spacebind--bs-set-leader-keys-for-major-mode nil spacebind--bs-set-leader-keys-for-major-mode nil
spacebind--bs-set-leader-keys nil spacebind--bs-set-leader-keys nil
@ -266,7 +266,7 @@ The forms will be concatenated and substituted by `spacebind' macro."
form) form)
(lambda (key-seq fn-symbol label) (lambda (key-seq fn-symbol label)
`(progn `(progn
(push (list ',key-seq ,label) spacebind--bs-add-global-replacements) (push (list ',key-seq ,label) spacebind--bs-global-replacements)
(push (list ',key-seq ',fn-symbol) spacebind--bs-set-leader-keys))) (push (list ',key-seq ',fn-symbol) spacebind--bs-set-leader-keys)))
(lambda (key-prefix label) (lambda (key-prefix label)
`(push (list ',key-prefix ,label) spacebind--bs-declare-prefix)))) `(push (list ',key-prefix ,label) spacebind--bs-declare-prefix))))

24
tests/core/core-spacebind-utest.el
View File

@ -102,7 +102,7 @@ The return value is a plist with the shape:
:set-leader-keys <STACK> :set-leader-keys <STACK>
:set-leader-keys-for-major-mode <STACK> :set-leader-keys-for-major-mode <STACK>
:set-leader-keys-for-minor-mode <STACK> :set-leader-keys-for-minor-mode <STACK>
:add-global-replacements <STACK>) :global-replacements <STACK>)
<STACK> is a corresponding binding stack. <STACK> is a corresponding binding stack.
@ -126,9 +126,9 @@ NOTE: `spacebind--eager-bind' set to true."
spacebind--bs-set-leader-keys-for-major-mode spacebind--bs-set-leader-keys-for-major-mode
:set-leader-keys-for-minor-mode :set-leader-keys-for-minor-mode
spacebind--bs-set-leader-keys-for-minor-mode spacebind--bs-set-leader-keys-for-minor-mode
:add-global-replacements :global-replacements
spacebind--bs-add-global-replacements) spacebind--bs-global-replacements)
spacebind--bs-add-global-replacements nil spacebind--bs-global-replacements nil
spacebind--bs-set-leader-keys-for-minor-mode nil spacebind--bs-set-leader-keys-for-minor-mode nil
spacebind--bs-set-leader-keys-for-major-mode nil spacebind--bs-set-leader-keys-for-major-mode nil
spacebind--bs-set-leader-keys nil spacebind--bs-set-leader-keys nil
@ -165,7 +165,7 @@ NOTE: `spacebind--eager-bind' set to true. "
(spacebind--bs-set-leader-keys '()) (spacebind--bs-set-leader-keys '())
(spacebind--bs-set-leader-keys-for-major-mode '()) (spacebind--bs-set-leader-keys-for-major-mode '())
(spacebind--bs-set-leader-keys-for-minor-mode '()) (spacebind--bs-set-leader-keys-for-minor-mode '())
(spacebind--bs-add-global-replacements '()) (spacebind--bs-global-replacements '())
(spacebind--timer [t]) (spacebind--timer [t])
(called nil) (called nil)
((symbol-function 'spacebind//process-bind-stack) ((symbol-function 'spacebind//process-bind-stack)
@ -179,7 +179,7 @@ NOTE: `spacebind--eager-bind' set to true. "
spacebind--bs-set-leader-keys spacebind--bs-set-leader-keys
spacebind--bs-set-leader-keys-for-major-mode spacebind--bs-set-leader-keys-for-major-mode
spacebind--bs-set-leader-keys-for-minor-mode spacebind--bs-set-leader-keys-for-minor-mode
spacebind--bs-add-global-replacements))) spacebind--bs-global-replacements)))
(when (listp el) ;; all list arguments are key sequences. (when (listp el) ;; all list arguments are key sequences.
(condition-case err (kbd (string-join el " ")) (condition-case err (kbd (string-join el " "))
((error nil) (push err invalid-key-seqs))))) ((error nil) (push err invalid-key-seqs)))))
@ -205,7 +205,7 @@ NOTE: `spacebind--eager-bind' set to true. "
:declare-prefix nil :declare-prefix nil
:set-leader-keys nil :set-leader-keys nil
:set-leader-keys-for-minor-mode nil :set-leader-keys-for-minor-mode nil
:add-global-replacements nil)) :global-replacements nil))
(eq nil) (eq nil)
(should))) (should)))
@ -228,7 +228,7 @@ NOTE: `spacebind--eager-bind' set to true. "
:declare-prefix nil :declare-prefix nil
:set-leader-keys nil :set-leader-keys nil
:set-leader-keys-for-major-mode nil :set-leader-keys-for-major-mode nil
:add-global-replacements nil)) :global-replacements nil))
(eq nil) (eq nil)
(should))) (should)))
@ -244,7 +244,7 @@ NOTE: `spacebind--eager-bind' set to true. "
((("a") "section under a key")) ((("a") "section under a key"))
:set-leader-keys :set-leader-keys
((("a" "b") bar-fn)) ((("a" "b") bar-fn))
:add-global-replacements :global-replacements
((("a" "b") "call bar-fn")) ((("a" "b") "call bar-fn"))
:minor-mode-replacements nil :minor-mode-replacements nil
:major-mode-replacements nil :major-mode-replacements nil
@ -306,7 +306,7 @@ NOTE: `spacebind--eager-bind' set to true. "
(("a" foo-fn "This is a (("a" foo-fn "This is a
multi line string"))) multi line string")))
(test-spacebind|log-stack-eval) (test-spacebind|log-stack-eval)
(plist-get :add-global-replacements) (plist-get :global-replacements)
(car) (car)
(equal '(("a") "This is a multi line string")) (equal '(("a") "This is a multi line string"))
(should)) (should))
@ -336,7 +336,7 @@ NOTE: `spacebind--eager-bind' set to true. "
:global :global
(("a" foo-fn "this part goes into label | that part omitted"))) (("a" foo-fn "this part goes into label | that part omitted")))
(test-spacebind|log-stack-eval) (test-spacebind|log-stack-eval)
(plist-get :add-global-replacements) (plist-get :global-replacements)
(car) (car)
(equal '(("a") "this part goes into label")) (equal '(("a") "this part goes into label"))
(should)) (should))
@ -446,7 +446,7 @@ NOTE: `spacebind--eager-bind' set to true. "
((some-another-minor-mode ("a" "b" "c" "b") baz-fn) ((some-another-minor-mode ("a" "b" "c" "b") baz-fn)
(some-minor-mode ("a" "c" "d" "e") baz-fn) (some-minor-mode ("a" "c" "d" "e") baz-fn)
(some-minor-mode ("a" "b") foo-fn)) (some-minor-mode ("a" "b") foo-fn))
:add-global-replacements :global-replacements
((("C-v" "b") "call bar-fn")))) ((("C-v" "b") "call bar-fn"))))
(eq nil) (eq nil)
(should))) (should)))

2
tests/layers/+distribution/spacemacs-base/spacebind-utest.el
View File

@ -23,7 +23,7 @@ NOTE: `spacebind--eager-bind' set to true. "
(spacebind--bs-set-leader-keys '()) (spacebind--bs-set-leader-keys '())
(spacebind--bs-set-leader-keys-for-major-mode '()) (spacebind--bs-set-leader-keys-for-major-mode '())
(spacebind--bs-set-leader-keys-for-minor-mode '()) (spacebind--bs-set-leader-keys-for-minor-mode '())
(spacebind--bs-add-global-replacements '()) (spacebind--bs-global-replacements '())
(spacebind--timer [t]) (spacebind--timer [t])
(called nil) (called nil)
((symbol-function 'spacebind//process-bind-stack) ((symbol-function 'spacebind//process-bind-stack)