react layer: complete refactor to simplify the layer

Define functions for setting key bindings and leverage pre and post
init mechanism.
This commit is contained in:
syl20bnr 2015-08-25 20:57:56 -04:00
parent 53e9b6c1f1
commit 213bf5589c
3 changed files with 94 additions and 231 deletions

View file

@ -1,41 +0,0 @@
;;; funcs.el --- react Layer packages File for Spacemacs
;;
;; Copyright (c) 2012-2015 Sylvain Benner
;; Copyright (c) 2014-2015 Andrea Moretti & Contributors
;;
;; Author: Andrea Moretti <axyzxp@gmail.com>
;; URL: https://github.com/axyz
;;
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
(defun spacemacs//react-config-flycheck ()
(with-eval-after-load 'flycheck
;; use eslint with web-mode for jsx files
(flycheck-add-mode 'javascript-eslint 'react-mode)
;; disable jshint since we prefer eslint checking
(setq-default flycheck-disabled-checkers
(append flycheck-disabled-checkers
'(javascript-jshint)))
;; disable json-jsonlist checking for json files
(setq-default flycheck-disabled-checkers
(append flycheck-disabled-checkers
'(json-jsonlist)))))
(defun spacemacs//react-config-web-mode ()
(emmet-mode 0)
(defadvice web-mode-highlight-part (around tweak-jsx activate)
(let ((web-mode-enable-part-face nil))
ad-do-it)))
(defun spacemacs//react-load-js2-refactor ()
"Lazy load js2-refactor"
(require 'js2-refactor))
(defun spacemacs//react-load-js-doc ()
"Lazy load js-doc"
(require 'js-doc))

View file

@ -18,9 +18,6 @@
js-doc
js2-mode
js2-refactor
json-mode
json-snatcher
tern
web-beautify
web-mode
))
@ -29,147 +26,50 @@
(defun react/post-init-company ()
(spacemacs|add-company-hook react-mode))
(defun react/init-company-tern ()
(use-package company-tern
:if (and (configuration-layer/package-usedp 'company)
(configuration-layer/package-usedp 'tern))
:defer t
:init
(push 'company-tern company-backends-react-mode))))
(defun react/post-init-company-tern ()
(push 'company-tern company-backends-react-mode)))
(defun react/pre-init-flycheck ()
(spacemacs|use-package-add-hook flycheck
:post-config
(progn
(flycheck-add-mode 'javascript-eslint 'react-mode)
(setq-default
;; disable jshint since we prefer eslint checking
flycheck-disabled-checkers (append flycheck-disabled-checkers
'(javascript-jshint))
;; disable json-jsonlist checking for json files
flycheck-disabled-checkers (append flycheck-disabled-checkers
'(json-jsonlist))))))
(defun react/post-init-flycheck ()
(add-hook 'react-mode-hook 'spacemacs//react-config-flycheck))
(add-hook 'react-mode-hook 'flycheck-mode))
(defun react/init-js-doc ()
(use-package js-doc
:defer t
:init (add-hook 'react-mode-hook 'spacemacs//react-load-js-doc)
:config
(progn
(evil-leader/set-key-for-mode 'react-mode "mrdb" 'js-doc-insert-file-doc)
(evil-leader/set-key-for-mode 'react-mode "mrdf" 'js-doc-insert-function-doc)
(evil-leader/set-key-for-mode 'react-mode "mrdt" 'js-doc-insert-tag)
(evil-leader/set-key-for-mode 'react-mode "mrdh" 'js-doc-describe-tag))))
(defun react/post-init-js-doc ()
(add-hook 'react-mode-hook 'spacemacs/js-doc-require)
(spacemacs/js-doc-set-key-bindings 'react-mode))
(defun react/init-js2-mode ()
(use-package js2-mode
:defer t
:init
;; required to make `<SPC> s l' to work correctly
(add-hook 'react-mode-hook 'js2-imenu-extras-mode)
(add-hook 'react-mode-hook 'js2-minor-mode))
:config
(progn
(spacemacs/declare-prefix-for-mode 'js2-mode "m" "major mode")
(defun react/post-init-js2-mode ()
(add-hook 'react-mode-hook 'js2-imenu-extras-mode)
(add-hook 'react-mode-hook 'js2-minor-mode))
(evil-leader/set-key-for-mode 'js2-mode "mw" 'js2-mode-toggle-warnings-and-errors)
(defun react/post-init-js2-refactor ()
(add-hook 'react-mode-hook 'spacemacs/js2-refactor-require)
(spacemacs/js2-refactor-set-key-bindings 'react-mode))
(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)
(evil-leader/set-key-for-mode 'js2-mode "mze" 'js2-mode-toggle-element)
(evil-leader/set-key-for-mode 'js2-mode "mzF" 'js2-mode-toggle-hide-functions)
(evil-leader/set-key-for-mode 'js2-mode "mzC" 'js2-mode-toggle-hide-comments)))
(defun react/init-js2-refactor ()
(use-package js2-refactor
:defer t
:init (add-hook 'react-mode-hook 'spacemacs//react-load-js2-refactor)
:config
(progn
(spacemacs/declare-prefix-for-mode 'react-mode "mr" "refactor")
(spacemacs/declare-prefix-for-mode 'react-mode "mr3" "ternary")
(evil-leader/set-key-for-mode 'react-mode "mr3i" 'js2r-ternary-to-if)
(spacemacs/declare-prefix-for-mode 'react-mode "mra" "add/args")
(evil-leader/set-key-for-mode 'react-mode "mrag" 'js2r-add-to-globals-annotation)
(evil-leader/set-key-for-mode 'react-mode "mrao" 'js2r-arguments-to-object)
(spacemacs/declare-prefix-for-mode 'react-mode "mrb" "barf")
(evil-leader/set-key-for-mode 'react-mode "mrba" 'js2r-forward-barf)
(spacemacs/declare-prefix-for-mode 'react-mode "mrc" "contract")
(evil-leader/set-key-for-mode 'react-mode "mrca" 'js2r-contract-array)
(evil-leader/set-key-for-mode 'react-mode "mrco" 'js2r-contract-object)
(evil-leader/set-key-for-mode 'react-mode "mrcu" 'js2r-contract-function)
(spacemacs/declare-prefix-for-mode 'react-mode "mre" "expand/extract")
(evil-leader/set-key-for-mode 'react-mode "mrea" 'js2r-expand-array)
(evil-leader/set-key-for-mode 'react-mode "mref" 'js2r-extract-function)
(evil-leader/set-key-for-mode 'react-mode "mrem" 'js2r-extract-method)
(evil-leader/set-key-for-mode 'react-mode "mreo" 'js2r-expand-object)
(evil-leader/set-key-for-mode 'react-mode "mreu" 'js2r-expand-function)
(evil-leader/set-key-for-mode 'react-mode "mrev" 'js2r-extract-var)
(spacemacs/declare-prefix-for-mode 'react-mode "mri" "inline/inject/introduct")
(evil-leader/set-key-for-mode 'react-mode "mrig" 'js2r-inject-global-in-iife)
(evil-leader/set-key-for-mode 'react-mode "mrip" 'js2r-introduce-parameter)
(evil-leader/set-key-for-mode 'react-mode "mriv" 'js2r-inline-var)
(spacemacs/declare-prefix-for-mode 'react-mode "mrl" "localize/log")
(evil-leader/set-key-for-mode 'react-mode "mrlp" 'js2r-localize-parameter)
(evil-leader/set-key-for-mode 'react-mode "mrlt" 'js2r-log-this)
(spacemacs/declare-prefix-for-mode 'react-mode "mrr" "rename")
(evil-leader/set-key-for-mode 'react-mode "mrrv" 'js2r-rename-var)
(spacemacs/declare-prefix-for-mode 'react-mode "mrs" "split/slurp")
(evil-leader/set-key-for-mode 'react-mode "mrsl" 'js2r-forward-slurp)
(evil-leader/set-key-for-mode 'react-mode "mrss" 'js2r-split-string)
(evil-leader/set-key-for-mode 'react-mode "mrsv" 'js2r-split-var-declaration)
(spacemacs/declare-prefix-for-mode 'react-mode "mrt" "toggle")
(evil-leader/set-key-for-mode 'react-mode "mrtf" 'js2r-toggle-function-expression-and-declaration)
(spacemacs/declare-prefix-for-mode 'react-mode "mru" "unwrap")
(evil-leader/set-key-for-mode 'react-mode "mruw" 'js2r-unwrap)
(spacemacs/declare-prefix-for-mode 'react-mode "mrv" "var")
(evil-leader/set-key-for-mode 'react-mode "mrvt" 'js2r-var-to-this)
(spacemacs/declare-prefix-for-mode 'react-mode "mrw" "wrap")
(evil-leader/set-key-for-mode 'react-mode "mrwi" 'js2r-wrap-buffer-in-iife)
(evil-leader/set-key-for-mode 'react-mode "mrwl" 'js2r-wrap-in-for-loop)
(evil-leader/set-key-for-mode 'react-mode "mk" 'js2r-kill)
(evil-leader/set-key-for-mode 'react-mode "xmj" 'js2r-move-line-down)
(evil-leader/set-key-for-mode 'react-mode "xmk" 'js2r-move-line-up))))
(defun react/init-json-mode ()
(use-package json-mode
:defer t))
(defun react/init-json-snatcher ()
(use-package json-snatcher
:defer t
:config
(evil-leader/set-key-for-mode 'json-mode
"mhp" 'jsons-print-path)))
(defun react/init-tern ()
(use-package tern
:defer t
:config
(progn
(evil-leader/set-key-for-mode 'react-mode "mrrV" 'tern-rename-variable)
(evil-leader/set-key-for-mode 'react-mode "mhd" 'tern-get-docs)
(evil-leader/set-key-for-mode 'react-mode "mgg" 'tern-find-definition)
(evil-leader/set-key-for-mode 'react-mode "mgG" 'tern-find-definition-by-name)
(evil-leader/set-key-for-mode 'react-mode (kbd "m C-g") 'tern-pop-find-definition)
(evil-leader/set-key-for-mode 'react-mode "mht" 'tern-get-type))))
(defun react/init-web-beautify ()
(use-package web-beautify
:defer t
:init
(progn
(evil-leader/set-key-for-mode 'react-mode "m=" 'web-beautify-js))))
(defun react/post-init-web-beautify ()
(evil-leader/set-key-for-mode 'react-mode "m=" 'web-beautify-js))
(defun react/post-init-web-mode ()
(define-derived-mode react-mode web-mode "react")
(add-to-list 'auto-mode-alist '("\\.jsx\\'" . react-mode))
(add-to-list 'auto-mode-alist '("\\.react.js\\'" . react-mode))
(add-to-list 'magic-mode-alist '("/** @jsx React.DOM */" . react-mode))
(add-hook 'react-mode-hook 'spacemacs//react-config-web-mode))
(defun spacemacs//setup-react-mode ()
"Adjust web-mode to accommodate react-mode"
(emmet-mode 0)
;; Why do we do this ?
(defadvice web-mode-highlight-part (around tweak-jsx activate)
(let ((web-mode-enable-part-face nil))
ad-do-it)))
(add-hook 'react-mode-hook 'spacemacs//setup-react-mode))

View file

@ -72,68 +72,70 @@
:defer t
:init
(progn
(defun javascript/load-js2-refactor ()
(defun spacemacs/js2-refactor-require ()
"Lazy load js2-refactor"
(require 'js2-refactor))
(add-hook 'js2-mode-hook 'javascript/load-js2-refactor))
:init
(progn
(spacemacs/declare-prefix-for-mode 'js2-mode "mr3" "ternary")
(evil-leader/set-key-for-mode 'js2-mode "mr3i" 'js2r-ternary-to-if)
(add-hook 'js2-mode-hook 'spacemacs/js2-refactor-require)
(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)
(defun spacemacs/js2-refactor-set-key-bindings (mode)
(spacemacs/declare-prefix-for-mode mode "mr3" "ternary")
(evil-leader/set-key-for-mode mode "mr3i" 'js2r-ternary-to-if)
(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 mode "mra" "add/args")
(evil-leader/set-key-for-mode mode "mrag" 'js2r-add-to-globals-annotation)
(evil-leader/set-key-for-mode mode "mrao" 'js2r-arguments-to-object)
(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 mode "mrb" "barf")
(evil-leader/set-key-for-mode mode "mrba" 'js2r-forward-barf)
(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)
(evil-leader/set-key-for-mode 'js2-mode "mreo" 'js2r-expand-object)
(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 mode "mrc" "contract")
(evil-leader/set-key-for-mode mode "mrca" 'js2r-contract-array)
(evil-leader/set-key-for-mode mode "mrco" 'js2r-contract-object)
(evil-leader/set-key-for-mode mode "mrcu" 'js2r-contract-function)
(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 mode "mre" "expand/extract")
(evil-leader/set-key-for-mode mode "mrea" 'js2r-expand-array)
(evil-leader/set-key-for-mode mode "mref" 'js2r-extract-function)
(evil-leader/set-key-for-mode mode "mrem" 'js2r-extract-method)
(evil-leader/set-key-for-mode mode "mreo" 'js2r-expand-object)
(evil-leader/set-key-for-mode mode "mreu" 'js2r-expand-function)
(evil-leader/set-key-for-mode mode "mrev" 'js2r-extract-var)
(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 mode "mri" "inline/inject/introduct")
(evil-leader/set-key-for-mode mode "mrig" 'js2r-inject-global-in-iife)
(evil-leader/set-key-for-mode mode "mrip" 'js2r-introduce-parameter)
(evil-leader/set-key-for-mode mode "mriv" 'js2r-inline-var)
(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 mode "mrl" "localize/log")
(evil-leader/set-key-for-mode mode "mrlp" 'js2r-localize-parameter)
(evil-leader/set-key-for-mode mode "mrlt" 'js2r-log-this)
(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 mode "mrr" "rename")
(evil-leader/set-key-for-mode mode "mrrv" 'js2r-rename-var)
(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 mode "mrs" "split/slurp")
(evil-leader/set-key-for-mode mode "mrsl" 'js2r-forward-slurp)
(evil-leader/set-key-for-mode mode "mrss" 'js2r-split-string)
(evil-leader/set-key-for-mode mode "mrsv" 'js2r-split-var-declaration)
(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 mode "mrt" "toggle")
(evil-leader/set-key-for-mode mode "mrtf" 'js2r-toggle-function-expression-and-declaration)
(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 mode "mru" "unwrap")
(evil-leader/set-key-for-mode mode "mruw" 'js2r-unwrap)
(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)
(spacemacs/declare-prefix-for-mode mode "mrv" "var")
(evil-leader/set-key-for-mode mode "mrvt" 'js2r-var-to-this)
(evil-leader/set-key-for-mode 'js2-mode "mk" 'js2r-kill)
(evil-leader/set-key-for-mode 'js2-mode "xmj" 'js2r-move-line-down)
(evil-leader/set-key-for-mode 'js2-mode "xmk" 'js2r-move-line-up))))
(spacemacs/declare-prefix-for-mode mode "mrw" "wrap")
(evil-leader/set-key-for-mode mode "mrwi" 'js2r-wrap-buffer-in-iife)
(evil-leader/set-key-for-mode mode "mrwl" 'js2r-wrap-in-for-loop)
(evil-leader/set-key-for-mode mode "mk" 'js2r-kill)
(evil-leader/set-key-for-mode mode "xmj" 'js2r-move-line-down)
(evil-leader/set-key-for-mode mode "xmk" 'js2r-move-line-up))
(spacemacs/js2-refactor-set-key-bindings 'js2-mode))))
(defun javascript/init-json-mode ()
(use-package json-mode
@ -165,16 +167,18 @@
:defer t
:init
(progn
(defun javascript/load-js-doc ()
(defun spacemacs/js-doc-require ()
"Lazy load js-doc"
(require 'js-doc))
(add-hook 'js2-mode-hook 'javascript/load-js-doc))
:config
(progn
(evil-leader/set-key-for-mode 'js2-mode "mrdb" 'js-doc-insert-file-doc)
(evil-leader/set-key-for-mode 'js2-mode "mrdf" 'js-doc-insert-function-doc)
(evil-leader/set-key-for-mode 'js2-mode "mrdt" 'js-doc-insert-tag)
(evil-leader/set-key-for-mode 'js2-mode "mrdh" 'js-doc-describe-tag))))
(add-hook 'js2-mode-hook 'spacemacs/js-doc-require)
(defun spacemacs/js-doc-set-key-bindings (mode)
"Setup the key bindings for `js2-doc' for the given MODE."
(evil-leader/set-key-for-mode mode "mrdb" 'js-doc-insert-file-doc)
(evil-leader/set-key-for-mode mode "mrdf" 'js-doc-insert-function-doc)
(evil-leader/set-key-for-mode mode "mrdt" 'js-doc-insert-tag)
(evil-leader/set-key-for-mode mode "mrdh" 'js-doc-describe-tag))
(spacemacs/js-doc-set-key-bindings 'js2-mode))))
(defun javascript/init-web-beautify ()
(use-package web-beautify