From 786dae5a5d95d7d9f137bd2f86eb71c856b7a5ba Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 29 Aug 2024 00:47:29 -0400 Subject: [PATCH] fix(lsp): don't warn about npm without +eglot This is only a concern for lsp-mode, which tries to auto-install servers if `lsp-enable-suggest-server-download` is non-nil (which it is, by default). Amend: #7346 --- modules/tools/lsp/doctor.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/tools/lsp/doctor.el b/modules/tools/lsp/doctor.el index a438973e5..60b3aa793 100644 --- a/modules/tools/lsp/doctor.el +++ b/modules/tools/lsp/doctor.el @@ -4,7 +4,6 @@ (modulep! +peek))) "+eglot and +peek flags are not compatible. Peek uses lsp-mode, while Eglot is another package altogether for LSP.") -(when (modulep! +eglot) +(unless (modulep! +eglot) (unless (executable-find "npm") - (warn! "Couldn't find npm, most server installers won't work and will have to be installed manually. -For more information, see https://emacs-lsp.github.io/lsp-mode/page/languages/."))) + (warn! "Couldn't find npm. `lsp-mode' needs npm to auto-install some LSP servers. For more information, see https://emacs-lsp.github.io/lsp-mode/page/languages/.")))