diff --git a/contrib/!lang/clojure/config.el b/contrib/!lang/clojure/config.el index 53c5f0a41..9337eee79 100644 --- a/contrib/!lang/clojure/config.el +++ b/contrib/!lang/clojure/config.el @@ -22,9 +22,9 @@ (defvar clojure-enable-fancify-symbols nil "If non nil the `fancify-symbols' function is enabled.") -(setq clojure/key-binding-prefixes '(("md" . "documentation") - ("me" . "evaluation") +(setq clojure/key-binding-prefixes '(("me" . "evaluation") ("mg" . "goto") + ("mh" . "documentation") ("mr" . "refactor") ("mt" . "test"))) (mapc (lambda (x) (spacemacs/declare-prefix-for-mode diff --git a/contrib/!lang/javascript/config.el b/contrib/!lang/javascript/config.el index 306f86e14..9ceb60cab 100644 --- a/contrib/!lang/javascript/config.el +++ b/contrib/!lang/javascript/config.el @@ -13,3 +13,11 @@ ;; Variables (spacemacs|defvar-company-backends js2-mode) + + +(setq javascript/key-binding-prefixes '(("mh" . "documentation") + ("mg" . "goto") + ("mr" . "refactor"))) +(mapc (lambda (x) (spacemacs/declare-prefix-for-mode + 'js2-mode (car x) (cdr x))) + javascript/key-binding-prefixes) diff --git a/contrib/!lang/javascript/packages.el b/contrib/!lang/javascript/packages.el index 0e16f7a13..2f1a0a9a3 100644 --- a/contrib/!lang/javascript/packages.el +++ b/contrib/!lang/javascript/packages.el @@ -57,11 +57,9 @@ (add-hook 'js2-mode-hook 'js2-imenu-extras-mode)) :config (progn - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "m" "major mode") - (evil-leader/set-key-for-mode 'js2-mode "mw" 'js2-mode-toggle-warnings-and-errors) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mz" "folding") + (spacemacs/declare-prefix-for-mode 'js2-mode "mz" "folding") (evil-leader/set-key-for-mode 'js2-mode "mzc" 'js2-mode-hide-element) (evil-leader/set-key-for-mode 'js2-mode "mzo" 'js2-mode-show-element) (evil-leader/set-key-for-mode 'js2-mode "mzr" 'js2-mode-show-all) @@ -78,26 +76,24 @@ "Lazy load js2-refactor" (require 'js2-refactor)) (add-hook 'js2-mode-hook 'javascript/load-js2-refactor)) - :config + :init (progn - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mr" "refactor") - - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mr3" "ternary") + (spacemacs/declare-prefix-for-mode 'js2-mode "mr3" "ternary") (evil-leader/set-key-for-mode 'js2-mode "mr3i" 'js2r-ternary-to-if) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mra" "add/args") + (spacemacs/declare-prefix-for-mode 'js2-mode "mra" "add/args") (evil-leader/set-key-for-mode 'js2-mode "mrag" 'js2r-add-to-globals-annotation) (evil-leader/set-key-for-mode 'js2-mode "mrao" 'js2r-arguments-to-object) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mrb" "barf") + (spacemacs/declare-prefix-for-mode 'js2-mode "mrb" "barf") (evil-leader/set-key-for-mode 'js2-mode "mrba" 'js2r-forward-barf) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mrc" "contract") + (spacemacs/declare-prefix-for-mode 'js2-mode "mrc" "contract") (evil-leader/set-key-for-mode 'js2-mode "mrca" 'js2r-contract-array) (evil-leader/set-key-for-mode 'js2-mode "mrco" 'js2r-contract-object) (evil-leader/set-key-for-mode 'js2-mode "mrcu" 'js2r-contract-function) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mre" "expand/extract") + (spacemacs/declare-prefix-for-mode 'js2-mode "mre" "expand/extract") (evil-leader/set-key-for-mode 'js2-mode "mrea" 'js2r-expand-array) (evil-leader/set-key-for-mode 'js2-mode "mref" 'js2r-extract-function) (evil-leader/set-key-for-mode 'js2-mode "mrem" 'js2r-extract-method) @@ -105,33 +101,33 @@ (evil-leader/set-key-for-mode 'js2-mode "mreu" 'js2r-expand-function) (evil-leader/set-key-for-mode 'js2-mode "mrev" 'js2r-extract-var) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mri" "inline/inject/introduct") + (spacemacs/declare-prefix-for-mode 'js2-mode "mri" "inline/inject/introduct") (evil-leader/set-key-for-mode 'js2-mode "mrig" 'js2r-inject-global-in-iife) (evil-leader/set-key-for-mode 'js2-mode "mrip" 'js2r-introduce-parameter) (evil-leader/set-key-for-mode 'js2-mode "mriv" 'js2r-inline-var) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mrl" "localize/log") + (spacemacs/declare-prefix-for-mode 'js2-mode "mrl" "localize/log") (evil-leader/set-key-for-mode 'js2-mode "mrlp" 'js2r-localize-parameter) (evil-leader/set-key-for-mode 'js2-mode "mrlt" 'js2r-log-this) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mrr" "rename") + (spacemacs/declare-prefix-for-mode 'js2-mode "mrr" "rename") (evil-leader/set-key-for-mode 'js2-mode "mrrv" 'js2r-rename-var) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mrs" "split/slurp") + (spacemacs/declare-prefix-for-mode 'js2-mode "mrs" "split/slurp") (evil-leader/set-key-for-mode 'js2-mode "mrsl" 'js2r-forward-slurp) (evil-leader/set-key-for-mode 'js2-mode "mrss" 'js2r-split-string) (evil-leader/set-key-for-mode 'js2-mode "mrsv" 'js2r-split-var-declaration) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mrt" "toggle") + (spacemacs/declare-prefix-for-mode 'js2-mode "mrt" "toggle") (evil-leader/set-key-for-mode 'js2-mode "mrtf" 'js2r-toggle-function-expression-and-declaration) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mru" "unwrap") + (spacemacs/declare-prefix-for-mode 'js2-mode "mru" "unwrap") (evil-leader/set-key-for-mode 'js2-mode "mruw" 'js2r-unwrap) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mrv" "var") + (spacemacs/declare-prefix-for-mode 'js2-mode "mrv" "var") (evil-leader/set-key-for-mode 'js2-mode "mrvt" 'js2r-var-to-this) - ;;(spacemacs/declare-prefix-for-mode 'js2-mode "mrw" "wrap") + (spacemacs/declare-prefix-for-mode 'js2-mode "mrw" "wrap") (evil-leader/set-key-for-mode 'js2-mode "mrwi" 'js2r-wrap-buffer-in-iife) (evil-leader/set-key-for-mode 'js2-mode "mrwl" 'js2r-wrap-in-for-loop) diff --git a/spacemacs/packages.el b/spacemacs/packages.el index 2f324a314..449d16ebb 100644 --- a/spacemacs/packages.el +++ b/spacemacs/packages.el @@ -3452,7 +3452,7 @@ one of `l' or `r'." which-key-description-replacement-alist))) (dolist (leader-key `(,dotspacemacs-leader-key ,dotspacemacs-emacs-leader-key)) (which-key-add-key-based-replacements - (concat leader-key " m") "maj mode cmds" + (concat leader-key " m") "major mode commands" (concat leader-key " " dotspacemacs-command-key) "M-x")) ;; disable special key handling for spacemacs, since it can be ;; disorienting if you don't understand it