refactor(lsp): switch to flycheck-eglot package

We no longer need to maintain our own juryrigged version of this functionality.
shartf · Feb 21, 2023 · 2561170 · 2561170
1 parent 83a5325
commit 2561170
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 81 deletions.
diff --git a/modules/tools/lsp/+eglot.el b/modules/tools/lsp/+eglot.el
@@ -25,10 +25,6 @@
 
   (add-to-list 'doom-debug-variables '(eglot-events-buffer-size . 0))
 
-  (when (modulep! :checkers syntax)
-    (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
@@ -55,3 +51,8 @@ server getting expensively restarted when reverting buffers."
   :when (modulep! :completion vertico)
   :init
   (map! :map eglot-mode-map [remap xref-find-apropos] #'consult-eglot-symbols))
+
+
+(use-package! flycheck-eglot
+  :when (modulep! :checkers syntax)
+  :hook (eglot-managed-mode . flycheck-eglot-mode))
diff --git a/modules/tools/lsp/autoload/flycheck-eglot.el b/modules/tools/lsp/autoload/flycheck-eglot.el
diff --git a/modules/tools/lsp/packages.el b/modules/tools/lsp/packages.el
@@ -5,7 +5,9 @@
     (progn
       (package! eglot :pin "e501275e06952889056268dabe08ccd0dbaf23e5")
       (when (modulep! :completion vertico)
-        (package! consult-eglot :pin "6504ccd2b7555452c61cc24a45965f7e2a37c44d")))
+        (package! consult-eglot :pin "6504ccd2b7555452c61cc24a45965f7e2a37c44d"))
+      (when (modulep! :checkers syntax)
+        (package! flycheck-eglot :pin "9abab011071c93250a894cf2bfeaf30c8e3367a7")))
   (package! lsp-mode :pin "a655f3600e040f872408da0e9c1b9fe65ca0aad9")
   (package! lsp-ui :pin "295d8984da06a745b0a36c56e28ce915bc389adb")
   (when (modulep! :completion ivy)