tweak(lsp): update to the new auto-enable convention

abougouffa · Dec 23, 2023 · 6856b09 · 6856b09
1 parent 69b20ed
commit 6856b09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/core/me-lib.el b/core/me-lib.el
@@ -1201,7 +1201,8 @@ be deleted.
   "Auto-enable Eglot in configured modes in `+eglot-auto-enable-modes'."
   (interactive)
   (dolist (mode +eglot-auto-enable-modes)
-    (add-hook 'after-change-major-mode-hook #'+eglot--ensure-maybe-h)))
+    (add-hook 'after-change-major-mode-hook #'+eglot--ensure-maybe-h)
+    (remove-hook 'after-change-major-mode-hook #'+lsp--ensure-maybe-h)))
 
 (defun +eglot-use-on-all-supported-modes (mode-list)
   "Add all modes in MODE-LIST to `+eglot-auto-enable-modes'."

diff --git a/modules/me-lsp.el b/modules/me-lsp.el
@@ -46,13 +46,16 @@
     "Modes for which LSP-mode can be automatically enabled by `+lsp-auto-enable'."
     :group 'minemacs-prog
     :type '(repeat symbol))
+  (defun +lsp--ensure-maybe-h ()
+    "Maybe auto start LSP if the current mode is in `+lsp-auto-enable-modes'."
+    (when (memq major-mode +lsp-auto-enable-modes)
+      (lsp-deferred)))
   (defun +lsp-auto-enable ()
     "Auto-enable LSP-mode in configured modes in `+lsp-auto-enable-modes'."
     (interactive)
     (dolist (mode +lsp-auto-enable-modes)
-      (let ((hook (intern (format "%s-hook" mode))))
-        (add-hook hook #'lsp-deferred)
-        (remove-hook hook #'eglot-ensure))))
+      (add-hook 'after-change-major-mode-hook #'+lsp--ensure-maybe-h)
+      (remove-hook 'after-change-major-mode-hook #'+eglot--ensure-maybe-h)))
   :config
   (+map! :keymaps 'lsp-mode-map
     :infix "c"