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

bump: :tools lsp

Browse source 
emacs-lsp/lsp-mode@41173dca4d -> emacs-lsp/lsp-mode@3d6a01dde9
joaotavora/eglot@55c13a9137 -> joaotavora/eglot@28092ba3af

Ref: #5904
Fix: #5927
Close: #5928
Close: #5933
Close: #5945
This commit is contained in:
Henrik Lissner 2021-12-18 00:17:37 +01:00
parent af7c1d79bd
commit 0cb8d1416f
2 changed files with 3 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,12 +7,6 @@
"The backends to prepend to `company-backends' in `lsp-mode' buffers. "The backends to prepend to `company-backends' in `lsp-mode' buffers.
Can be a list of backends; accepts any value `company-backends' accepts.") Can be a list of backends; accepts any value `company-backends' accepts.")
(defvar +lsp-prompt-to-install-server t
"If non-nil, prompt to install a server if no server is present.
If set to `quiet', suppress the install prompt and don't visibly inform the user
about it (it will be logged to *Messages* however).")
;; ;;
;;; Packages ;;; Packages
@ -127,23 +121,6 @@ server getting expensively restarted when reverting buffers."
(+lsp-optimization-mode -1)))) (+lsp-optimization-mode -1))))
lsp--cur-workspace)))) lsp--cur-workspace))))
(defadvice! +lsp-dont-prompt-to-install-servers-maybe-a (fn &rest args)
:around #'lsp
(when (buffer-file-name)
(require 'lsp-mode)
(lsp--require-packages)
(if (or (lsp--filter-clients
(-andfn #'lsp--matching-clients?
#'lsp--server-binary-present?))
(not (memq +lsp-prompt-to-install-server '(nil quiet))))
(apply fn args)
;; HACK `lsp--message' overrides `inhibit-message', so use `quiet!'
(let ((doom-debug-p
(or doom-debug-p
(not (eq +lsp-prompt-to-install-server 'quiet)))))
(doom-shut-up-a #'lsp--info "No language server available for %S"
major-mode)))))
(when (featurep! :ui modeline +light) (when (featurep! :ui modeline +light)
(defvar-local lsp-modeline-icon nil) (defvar-local lsp-modeline-icon nil)

6
modules/tools/lsp/packages.el
View file

@ -3,11 +3,11 @@
(if (featurep! +eglot) (if (featurep! +eglot)
(progn (progn
(package! eglot :pin "55c13a91378cdd7822c99bbbf340ea76b1f0bf38") (package! eglot :pin "28092ba3af6041a44227b92397c148a902413d1c")
(when (featurep! :completion vertico) (when (featurep! :completion vertico)
(package! consult-eglot :pin "f93c571dc392a8b11d35541bffde30bd9f411d30"))) (package! consult-eglot :pin "f93c571dc392a8b11d35541bffde30bd9f411d30")))
(package! lsp-mode :pin "41173dca4d6a7fa381ba6dc154e7149cb113f7e1") (package! lsp-mode :pin "3d6a01dde958db77a4597bf52e079f5b96469527")
(package! lsp-ui :pin "98d0ad00b8bf1d3a7cea490002169f2286d7208c") (package! lsp-ui :pin "e5d464537286b494334bab1056f8699a650d9d1f")
(when (featurep! :completion ivy) (when (featurep! :completion ivy)
(package! lsp-ivy :pin "3e87441a625d65ced5a208a0b0442d573596ffa3")) (package! lsp-ivy :pin "3e87441a625d65ced5a208a0b0442d573596ffa3"))
(when (featurep! :completion helm) (when (featurep! :completion helm)