Move smartparens config for web-mode into init-web.el

This commit is contained in:
Henrik Lissner 2015-03-17 02:36:28 -04:00
parent ee2a3380e7
commit 1d9ebc68ee
2 changed files with 11 additions and 3 deletions

View file

@ -29,9 +29,6 @@
(sp-with-modes '(json-mode js2-mode ruby-mode enh-ruby-mode python-mode)
(sp-local-pair "[" nil :post-handlers '(("||\n[i]" "RET"))))
;; Let web-mode handle autopairing
(sp-local-pair 'web-mode "<" nil :actions nil)
(after "yasnippet"
(defadvice yas-expand (before advice-for-yas-expand activate)
(sp-remove-active-pair-overlay)))))

View file

@ -22,6 +22,17 @@
web-mode-script-padding 2
web-mode-block-padding 2)
(after "smartparens"
(add-hook! 'web-mode-hook (setq web-mode-enable-auto-pairing nil))
(defun sp-web-mode-is-code-context (id action context)
(when (and (eq action 'insert)
(not (or (get-text-property (point) 'part-side)
(get-text-property (point) 'block-side))))
t))
(sp-local-pair 'web-mode "<" nil :when '(sp-web-mode-is-code-context)))
(after "web-beautify"
(add-hook! 'web-mode-hook (setenv "jsbeautify_indent_size" "4"))
(bind 'motion web-mode-map "gQ" 'web-beautify-html))