From 10623868b8be7673fac765bb2ac6191ca44c344e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 19 Feb 2020 23:41:39 -0500 Subject: [PATCH] Fix #2567: unbound js2-refactor keybinds --- modules/lang/javascript/config.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index 3598e0adf..0fdff1030 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -211,10 +211,7 @@ to tide." (use-package! js2-refactor :hook ((js2-mode rjsx-mode) . js2-refactor-mode) - :config - (when (featurep! :editor evil +everywhere) - (let ((js2-refactor-mode-map (evil-get-auxiliary-keymap js2-refactor-mode-map 'normal t t))) - (js2r-add-keybindings-with-prefix (format "%s r" doom-localleader-key)))) + :init (map! :after js2-mode :map js2-mode-map :localleader @@ -233,7 +230,12 @@ to tide." (:prefix ("u" . "unwrap")) (:prefix ("v" . "var")) (:prefix ("w" . "wrap")) - (:prefix ("3" . "ternary"))))) + (:prefix ("3" . "ternary")))) + :config + (when (featurep! :editor evil +everywhere) + (add-hook 'js2-refactor-mode-hook #'evil-normalize-keymaps) + (let ((js2-refactor-mode-map (evil-get-auxiliary-keymap js2-refactor-mode-map 'normal t t))) + (js2r-add-keybindings-with-prefix (format "%s r" doom-localleader-key))))) (use-package! eslintd-fix