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

Re-introduce +lsp-company-backends

Browse source 
Not a perfect solution, but it'll do while I figure out a better
solution for set-company-backends!'s inflexibility.
This commit is contained in:
Henrik Lissner 2020-08-01 15:18:02 -04:00
parent 318b3ef238
commit e852ac0469
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/tools/lsp/+lsp.el
View file

@ -1,5 +1,13 @@
;;; tools/lsp/+lsp.el -*- lexical-binding: t; -*- ;;; tools/lsp/+lsp.el -*- lexical-binding: t; -*-
(defvar +lsp-company-backends 'company-capf
"The backends to prepend to `company-backends' in `lsp-mode' buffers.
Can be a list of backends; accepts any value `company-backends' accepts.")
;;
;;; Packages
(use-package! lsp-mode (use-package! lsp-mode
:commands lsp-install-server :commands lsp-install-server
:init :init
@ -104,8 +112,9 @@ This also logs the resolved project root, if found, so we know where we are."
(add-hook 'company-mode-hook #'+lsp-init-company-h t t) (add-hook 'company-mode-hook #'+lsp-init-company-h t t)
;; Ensure `company-capf' is at the front of `company-backends' ;; Ensure `company-capf' is at the front of `company-backends'
(setq-local company-backends (setq-local company-backends
(cons 'company-capf (cons +lsp-company-backends
(remq 'company-capf company-backends))) (remove +lsp-company-backends
(remq 'company-capf company-backends))))
(remove-hook 'company-mode-hook #'+lsp-init-company-h t))) (remove-hook 'company-mode-hook #'+lsp-init-company-h t)))
(defun +lsp-init-flycheck-or-flymake-h () (defun +lsp-init-flycheck-or-flymake-h ()
"Set up flycheck-mode or flymake-mode, depending on `lsp-diagnostic-package'." "Set up flycheck-mode or flymake-mode, depending on `lsp-diagnostic-package'."