From fda382cc866feadc7212d1d5e7a7497c57b3b552 Mon Sep 17 00:00:00 2001 From: Gerry Agbobada <10496163+gagbo@users.noreply.github.com> Date: Sat, 1 May 2021 13:03:07 +0200 Subject: [PATCH] Feature-gate :tools lsp company-specific hooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As I’m trying to use [corfu](https://github.com/minad/corfu) for a bit, I found out that this hook prevents lsp-mode from starting if company-mode isn’t used. --- modules/tools/lsp/+lsp.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/tools/lsp/+lsp.el b/modules/tools/lsp/+lsp.el index 8548243a7..8103868f0 100644 --- a/modules/tools/lsp/+lsp.el +++ b/modules/tools/lsp/+lsp.el @@ -81,13 +81,14 @@ about it (it will be logged to *Messages* however).") (lsp--info "Could not guess project root.")))) #'+lsp-optimization-mode) - (add-hook! 'lsp-completion-mode-hook - (defun +lsp-init-company-backends-h () - (when lsp-completion-mode - (set (make-local-variable 'company-backends) - (cons +lsp-company-backends - (remove +lsp-company-backends - (remq 'company-capf company-backends))))))) + (when (featurep! :completion company) + (add-hook! 'lsp-completion-mode-hook + (defun +lsp-init-company-backends-h () + (when lsp-completion-mode + (set (make-local-variable 'company-backends) + (cons +lsp-company-backends + (remove +lsp-company-backends + (remq 'company-capf company-backends)))))))) (defvar +lsp--deferred-shutdown-timer nil) (defadvice! +lsp-defer-server-shutdown-a (orig-fn &optional restart)