emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move :company-backend setting to autoload.el

Browse source 
This decouples the company module from module load-order.
This commit is contained in:
Henrik Lissner 2018-06-01 14:53:49 +02:00
parent 3a809153f9
commit 80bd587d87
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/completion/company/autoload.el
View file

@ -1,5 +1,24 @@
;;; completion/company/autoload.el -*- lexical-binding: t; -*-
;;;###autoload
(def-setting! :company-backend (modes &rest backends)
"Prepends BACKENDS to `company-backends' in major MODES.
MODES should be one major-mode symbol or a list of them."
`(progn
,@(cl-loop for mode in (doom-enlist (doom-unquote modes))
for def-name = (intern (format "doom--init-company-%s" mode))
collect
`(defun ,def-name ()
(when (and (or (eq major-mode ',mode)
(bound-and-true-p ,mode))
,(not (eq backends '(nil))))
(require 'company)
(make-variable-buffer-local 'company-backends)
(dolist (backend (list ,@(reverse backends)))
(cl-pushnew backend company-backends :test #'equal))))
collect `(add-hook! ,mode #',def-name))))
;;;###autoload
(defun +company/toggle-auto-completion ()
"Toggle as-you-type code completion."

23
modules/completion/company/config.el
View file

@ -1,28 +1,5 @@
;;; completion/company/config.el -*- lexical-binding: t; -*-
(def-setting! :company-backend (modes &rest backends)
"Prepends BACKENDS to `company-backends' in major MODES.
MODES should be one major-mode symbol or a list of them."
`(progn
,@(cl-loop for mode in (doom-enlist (doom-unquote modes))
for def-name = (intern (format "doom--init-company-%s" mode))
collect
`(defun ,def-name ()
(when (and (or (eq major-mode ',mode)
(bound-and-true-p ,mode))
,(not (eq backends '(nil))))
(require 'company)
(make-variable-buffer-local 'company-backends)
(dolist (backend (list ,@(reverse backends)))
(cl-pushnew backend company-backends :test #'equal))))
collect `(add-hook! ,mode #',def-name))))
;;
;; Packages
;;
(def-package! company
:commands (company-complete-common company-manual-begin company-grab-line)
:init