emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dev: merge branch 'master' of github.com:doomemacs

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-08-29 11:01:17 -04:00
commit 17957d1d98
16 changed files with 121 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/tools/lsp/+lsp.el
View file

@ -97,7 +97,7 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
(setq-local flycheck-checker old-checker))
(apply fn args)))
(add-hook! 'lsp-mode-hook #'+lsp-optimization-mode)
(add-hook 'lsp-mode-hook #'+lsp-optimization-mode)
(when (modulep! :completion company)
(add-hook! 'lsp-completion-mode-hook

5
modules/tools/lsp/doctor.el
View file

@ -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/.")))