gitback/doomemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/lsp: fix lsp-mode init

Browse Source 
3f5cc4c63 introduced some big changes to how Doom starts lsp-mode. I've
deferred much more of the work to upstream, but it:

1. lsp's errors no longer made sense (complaining about servers having
   no automated install routine, despite having one).
2. Broke lsp support in indirect buffers (like org src/capture buffers).

So I half-reverted 3f5cc4c63 and added a +lsp-auto-install-servers
variable to make it optional (albeit opt-in).
This commit is contained in:
Henrik Lissner 2020-08-06 20:45:16 -04:00
parent 461b337734
commit 69259093e2
No known key found for this signature in database
GPG Key ID: 5F6C0EA160557395
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
modules/tools/lsp/+lsp.el
View File

@ -4,6 +4,13 @@
"The backends to prepend to `company-backends' in `lsp-mode' buffers.
Can be a list of backends; accepts any value `company-backends' accepts.")
(defvar +lsp-auto-install-servers nil
"If non-nil, automatically install LSP servers.
`lsp-mode' will prompt you to install an LSP server when you enter a major mode
with LSP support but no available server. I believe changes to your system
should be a deliberate act (as is flipping this variable).")
;;
;;; Packages
@ -64,14 +71,32 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
(let ((lsp-keymap-prefix (concat leader-key " c l")))
(lsp-enable-which-key-integration))))
(when lsp-auto-configure
(mapc (lambda (package) (require package nil t))
(cl-remove-if #'featurep lsp-client-packages)))
(defadvice! +lsp--dont-auto-install-servers-a (orig-fn &rest args)
"Don't auto-install LSP servers. Only complain if there aren't available."
"Replace auto-install behavior with warning and support indirect buffers."
:around #'lsp
;; `lsp' is normally eager to automatically install LSP servers, or
;; prompting to do so, but (in my opinion) server installation should be a
;; deliberate act by the end-user:
(letf! (defun lsp--client-download-server-fn (&rest _))
(apply orig-fn args)))
(if +lsp-auto-install-servers
(apply-orig-fn args)
(letf! ((buffer-file-name
;; Add support for indirect buffers (org src or capture buffers)
(or buffer-file-name
(buffer-file-name (buffer-base-buffer))))
;; Already loaded them. No need to do so again.
(lsp-client-packages nil)
;; `lsp' is normally eager to automatically install LSP servers, or
;; prompting to do so, but (in my opinion) server installation
;; should be a deliberate act by the end-user:
(defun lsp--completing-read (msg clients &rest _)
(lsp--warn (concat msg "%s\n"
" Use `M-x lsp-install-server' to install a supported server, or read "
"https://emacs-lsp.github.io/lsp-mode/page/languages for more.")
(mapcar #'lsp--client-server-id clients))
(throw 'not-installed nil)))
(catch 'not-installed
(apply orig-fn args)))))
(add-hook! 'lsp-mode-hook
(defun +lsp-init-optimizations-h ()
@ -127,7 +152,7 @@ server getting expensively restarted when reverting buffers."
(use-package! lsp-ui
:hook (lsp-mode . lsp-ui-mode)
:defer t
:config
(setq lsp-ui-doc-max-height 8
lsp-ui-doc-max-width 35