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

tweak(lsp): feature gate flycheck eglot

Browse source 
When flymake is enabled.
This commit is contained in:
Jeetaditya Chatterjee 2023-07-25 00:19:12 +01:00
parent 3d7e61fdcd
commit 37bfe0824b
No known key found for this signature in database
GPG key ID: 4A1E5568BA34D124
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/tools/lsp/+eglot.el
View file

@ -34,11 +34,6 @@
(add-to-list 'doom-debug-variables '(eglot-events-buffer-size . 0)) (add-to-list 'doom-debug-variables '(eglot-events-buffer-size . 0))
(when (and (modulep! :checkers syntax)
(not (modulep! :checkers syntax +flymake)))
(after! flycheck
(load! "autoload/flycheck-eglot")))
(defadvice! +lsp--defer-server-shutdown-a (fn &optional server) (defadvice! +lsp--defer-server-shutdown-a (fn &optional server)
"Defer server shutdown for a few seconds. "Defer server shutdown for a few seconds.
This gives the user a chance to open other project files before the server is This gives the user a chance to open other project files before the server is
@ -68,5 +63,6 @@ server getting expensively restarted when reverting buffers."
(use-package! flycheck-eglot (use-package! flycheck-eglot
:when (modulep! :checkers syntax) :when (and (modulep! :checkers syntax)
(not (modulep! :checkers syntax +flymake)))
:hook (eglot-managed-mode . flycheck-eglot-mode)) :hook (eglot-managed-mode . flycheck-eglot-mode))

3
modules/tools/lsp/packages.el
View file

@ -6,7 +6,8 @@
(package! eglot :pin "94e2d7460605b62b06695b9bb31b3e92fa876c34") (package! eglot :pin "94e2d7460605b62b06695b9bb31b3e92fa876c34")
(when (modulep! :completion vertico) (when (modulep! :completion vertico)
(package! consult-eglot :pin "db9d41c9812a5a8a7b9a22fa7f3c314e37584d41")) (package! consult-eglot :pin "db9d41c9812a5a8a7b9a22fa7f3c314e37584d41"))
(when (modulep! :checkers syntax) (when (and (modulep! :checkers syntax)
(not (modulep! :checkers syntax +flymake)))
(package! flycheck-eglot :pin "9ff8d0068be59b1450964b390349d75a68af21ed"))) (package! flycheck-eglot :pin "9ff8d0068be59b1450964b390349d75a68af21ed")))
(package! lsp-mode :pin "db0b3789b1d6a4b788e8cc37f8dbd45e2c592ad7") (package! lsp-mode :pin "db0b3789b1d6a4b788e8cc37f8dbd45e2c592ad7")
(package! lsp-ui :pin "295d8984da06a745b0a36c56e28ce915bc389adb") (package! lsp-ui :pin "295d8984da06a745b0a36c56e28ce915bc389adb")