home

commit 261124887f43d10733c11854fe1c432915e8240a
parent 4a79fb44925990f40c09e3d9c148d1b2fb069d1d
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue,  7 Apr 2020 18:24:26 +0200

emacs: update company-* in programming-*

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
tools/emacs/config/programming-go.el
 | 
10
++++++----
M
tools/emacs/config/programming-web.el
 | 
5
+++++

2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/tools/emacs/config/programming-go.el b/tools/emacs/config/programming-go.el
@@ -4,10 +4,6 @@
   :mode "\\.go$"
   :interpreter "go"
   :config
-  (use-package company-go
-    :config
-    (setq company-go-show-annotation t)
-    (push 'company-go company-backends))
                                         ;(setq gofmt-command "goimports")
   (if (not (executable-find "goimports"))
       (warn "go-mode: couldn't find goimports; no code formatting/fixed imports on save")
@@ -16,6 +12,12 @@
       (set (make-local-variable 'compile-command)
            "go build -v && go test -v && go vet")))
 
+(use-package company-go
+  :after (go-mode company)
+  :config
+  (setq company-go-show-annotation t)
+  (push 'company-go company-backends))
+
 (use-package flycheck-golangci-lint
   :disabled
   :hook (go-mode . flycheck-golangci-lint-setup)
diff --git a/tools/emacs/config/programming-web.el b/tools/emacs/config/programming-web.el
@@ -32,3 +32,8 @@
         (sp-local-tag "%" "<% "  " %>")
         (sp-local-tag "=" "<%= " " %>")
         (sp-local-tag "#" "<%# " " %>")))))
+
+(use-package company-css
+  :after (company css-mode)
+  :config
+  (push 'company-css company-backends))