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

lang/cc: refactor ccls config

Browse source 
1. Unset ccls-sem-highlight-method if lsp-enable-semantic-highlighting
   is nil (perhaps this should be reported upstream).
2. Fix load-order. Take `(use-package X :after Y :config Z)` for
   example. Z will be evaluated after Y loads, not after X loads. To
   customize Z you'd need to do `(after! Y ...)`. This is
   counter-intuitive. By removing `:after Y` and explicitly loading X
   when Y loads in :init, you can customize Z with `(after! X ...)` again.
3. Tie ccls-code-lens-mode to lsp-lens-mode, so lsp-lens-enable is
   respected.
This commit is contained in:
Henrik Lissner 2020-10-13 21:26:38 -04:00
parent 57669b4163
commit 0b480a6aad
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/lang/cc/config.el
View file

@ -271,16 +271,22 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
(use-package! ccls (use-package! ccls
:when (featurep! +lsp) :when (featurep! +lsp)
:unless (featurep! :tools lsp +eglot) :unless (featurep! :tools lsp +eglot)
:after lsp-mode :hook (lsp-lens-mode . ccls-code-lens-mode)
:init :init
(defvar ccls-sem-highlight-method 'font-lock)
(after! projectile (after! projectile
(add-to-list 'projectile-globally-ignored-directories ".ccls-cache") (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-bottom-up ".ccls-root")
(add-to-list 'projectile-project-root-files-top-down-recurring "compile_commands.json")) (add-to-list 'projectile-project-root-files-top-down-recurring "compile_commands.json"))
;; Avoid using `:after' because it ties the :config below to when `lsp-mode'
;; loads, rather than `ccls' loads.
(after! lsp-mode (require 'ccls))
:config :config
(add-hook 'lsp-after-open-hook #'ccls-code-lens-mode)
(set-evil-initial-state! 'ccls-tree-mode 'emacs) (set-evil-initial-state! 'ccls-tree-mode 'emacs)
(setq ccls-sem-highlight-method 'font-lock) ;; Disable `ccls-sem-highlight-method' if `lsp-enable-semantic-highlighting'
;; is nil. Otherwise, it appears ccls bypasses it.
(setq-hook! 'lsp-before-initialize-hook
ccls-sem-highlight-method (if lsp-enable-semantic-highlighting ccls-sem-highlight-method))
(when (or IS-MAC IS-LINUX) (when (or IS-MAC IS-LINUX)
(let ((cpu-count-command (cond (IS-MAC '("sysctl" "-n" "hw.ncpu")) (let ((cpu-count-command (cond (IS-MAC '("sysctl" "-n" "hw.ncpu"))
(IS-LINUX '("nproc")) (IS-LINUX '("nproc"))