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

html: fix addition of company backends

Browse source 
Move add-company-hook calls to correct init functions (only css backend is from
company package, the others are from company-web).

Correctly add company backends for jade and slim. Jade has been renamed to
Pug , there is no guarantee at all that jade references still work. To check.
This commit is contained in:
syl20bnr 2016-12-30 23:33:57 -05:00
parent 81b782e5df
commit e1efeea5d6
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
layers/+lang/html/packages.el
View file

@ -30,22 +30,18 @@
yasnippet
))
;;TODO: whenever company-web makes a backend for haml-mode it should be added here. -- @robbyoconnor
(defun html/post-init-company ()
(spacemacs|add-company-hook css-mode)
(spacemacs|add-company-hook jade-mode)
(spacemacs|add-company-hook slim-mode)
(spacemacs|add-company-hook web-mode))
(spacemacs|add-company-hook css-mode))
;;TODO: whenever company-web makes a backend for haml-mode it should be added here. -- @robbyoconnor
(defun html/init-company-web ()
(use-package company-web
:defer t
:init
(progn
(with-eval-after-load 'company-mode
(add-to-list 'company-backends 'company-web-html)
(add-to-list 'company-backends 'company-web-jade)
(add-to-list 'company-backends 'company-web-slim)))))
(spacemacs|add-company-hook jade-mode)
(spacemacs|add-company-hook slim-mode)
(spacemacs|add-company-hook web-mode))))
(defun html/init-css-mode ()
(use-package css-mode
@ -139,7 +135,8 @@
(defun html/init-pug-mode ()
(use-package pug-mode
:defer t
:mode ("\\.pug$" . pug-mode)))
:mode ("\\.pug$" . pug-mode)
:init (push 'company-web-jade company-backends-jade-mode)))
(defun html/init-sass-mode ()
(use-package sass-mode
@ -153,7 +150,8 @@
(defun html/init-slim-mode ()
(use-package slim-mode
:defer t))
:defer t
:init (push 'company-web-slim company-backends-slim-mode)))
(defun html/post-init-smartparens ()
(spacemacs/add-to-hooks