From 30c95e6519fadb2717c52e889920fc7b263c52ea Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 11 Sep 2025 13:38:51 -0400 Subject: [PATCH] fix(lsp): +eglot: stay out of company Fix: #8504 --- modules/tools/lsp/+eglot.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/tools/lsp/+eglot.el b/modules/tools/lsp/+eglot.el index 7d93645b8..f1483f982 100644 --- a/modules/tools/lsp/+eglot.el +++ b/modules/tools/lsp/+eglot.el @@ -8,9 +8,13 @@ eglot-autoshutdown t ;; NOTE: We disable eglot-auto-display-help-buffer because :select t in ;; its popup rule causes eglot to steal focus too often. - eglot-auto-display-help-buffer nil) - (when (modulep! :checkers syntax -flymake) - (setq eglot-stay-out-of '(flymake))) + eglot-auto-display-help-buffer nil + ;; Leave it to our modules and user config to initialize these. + eglot-stay-out-of + (append (if (modulep! :checkers syntax -flymake) + '(flymake)) + (if (modulep! :completion company) + '(company)))) :config (set-popup-rule! "^\\*eglot-help" :size 0.15 :quit t :select t)