.emacs.d

commit 8add52df86af1a5b80d7f9fdf4ac0807fb89bae0
parent 84b0e66e47e2e1cd921602dfff14afa5807d03c8
Author: Hugo Soucy <hsoucy@kronostechnologies.com>
Date:   Mon, 28 May 2018 09:43:32 -0400

Fix some probleme with company mode loading.

Diffstat:
M
partials/autocompletion.el
 | 
45
+++++++++++++++++++++++++++++++++++++--------

1 file changed, 37 insertions(+), 8 deletions(-)
diff --git a/partials/autocompletion.el b/partials/autocompletion.el
@@ -9,20 +9,49 @@
     :config
     (global-auto-complete-mode t))
 
+(use-package tern
+    ;; Tern-powered JavaScript integration
+    :ensure t
+    :pin melpa)
+
 (use-package company
     ;; Modular text completion framework.
     :ensure t
     :pin gnu
-    :requires
-    (tern-mode company-backends company-lua company-php company-shell company-tern company-web)
     :config
-    (add-to-list 'company-backends 'company-shell)
-    (add-hook 'js2-mode-hook (lambda ()
-                                 (tern-mode)
-                                 (company-mode)))
-    (add-hook 'after-init-hook 'global-company-mode)
+    (global-company-mode)
+
     (setq company-tooltip-limit 20)
     (setq company-tooltip-align-annotations 't)
     (setq company-idle-delayq 0.1)
     (setq company-begin-commands '(self-insert-command))
-    (setq company-etags-everywhere '(php-mode html-mode web-mode nxml-mode)))
+    (setq company-etags-everywhere '(php-mode html-mode web-mode nxml-mode scss-mode css-mode js2-mode)))
+
+(use-package company-lua
+    ;; Company backend for Lua
+    :ensure t
+    :pin melpa)
+
+(use-package company-php
+    ;; company completion source for php
+    :ensure t
+    :pin melpa)
+
+(use-package company-shell
+    ;; Company mode backend for shell functions
+    :ensure t
+    :pin melpa)
+
+(use-package company-tern
+    ;; Tern backend for company-mode
+    :ensure t
+    :requires
+    (tern)
+    :pin melpa)
+
+(use-package company-web
+    ;; Company version of ac-html, complete for web,html,emmet,jade,slim modes
+    :ensure t
+    :pin melpa)
+
+;;; autocompletion.el ends here