From 37bfe0824b4a7c9585acb454ce2065cc6fc427ac Mon Sep 17 00:00:00 2001 From: Jeetaditya Chatterjee Date: Tue, 25 Jul 2023 00:19:12 +0100 Subject: [PATCH] tweak(lsp): feature gate flycheck eglot When flymake is enabled. --- modules/tools/lsp/+eglot.el | 8 ++------ modules/tools/lsp/packages.el | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/tools/lsp/+eglot.el b/modules/tools/lsp/+eglot.el index 21b68ea13..95294f5eb 100644 --- a/modules/tools/lsp/+eglot.el +++ b/modules/tools/lsp/+eglot.el @@ -34,11 +34,6 @@ (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) "Defer server shutdown for a few seconds. 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 - :when (modulep! :checkers syntax) + :when (and (modulep! :checkers syntax) + (not (modulep! :checkers syntax +flymake))) :hook (eglot-managed-mode . flycheck-eglot-mode)) diff --git a/modules/tools/lsp/packages.el b/modules/tools/lsp/packages.el index 89c41f1ee..2ecf86626 100644 --- a/modules/tools/lsp/packages.el +++ b/modules/tools/lsp/packages.el @@ -6,7 +6,8 @@ (package! eglot :pin "94e2d7460605b62b06695b9bb31b3e92fa876c34") (when (modulep! :completion vertico) (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! lsp-mode :pin "db0b3789b1d6a4b788e8cc37f8dbd45e2c592ad7") (package! lsp-ui :pin "295d8984da06a745b0a36c56e28ce915bc389adb")