From af26a14230a2a72f165ed1645c038ead011dfb08 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 27 Aug 2019 00:04:11 -0400 Subject: [PATCH] lang/cc: decouple lsp init from ccls package --- modules/lang/cc/config.el | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 2d2dbc9a5..5652c8df1 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -230,17 +230,22 @@ This is ignored by ccls.") ;; ;; LSP +(when (featurep! +lsp) + (add-hook! '(c-mode-local-vars-hook + c++-mode-local-vars-hook + objc-mode-local-vars-hook) + (defun +cc-init-lsp-h () + (setq-local company-transformers nil) + (setq-local company-lsp-async t) + (setq-local company-lsp-cache-candidates nil) + (lsp!)))) + + (use-package! ccls :when (featurep! +lsp) - :hook ((c-mode-local-vars c++-mode-local-vars objc-mode-local-vars) . +cc|init-ccls) + :after lsp :init (after! projectile (add-to-list 'projectile-globally-ignored-directories ".ccls-cache") (add-to-list 'projectile-project-root-files-bottom-up ".ccls-root") - (add-to-list 'projectile-project-root-files-top-down-recurring "compile_commands.json")) - :config - (defun +cc|init-ccls () - (setq-local company-transformers nil) - (setq-local company-lsp-async t) - (setq-local company-lsp-cache-candidates nil) - (lsp!))) + (add-to-list 'projectile-project-root-files-top-down-recurring "compile_commands.json")))