From acae9f9acb328c46f71b4cc975abcdb95c09cee6 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 5 Jul 2022 01:35:06 +0200 Subject: [PATCH] bump: :tools lsp emacs-lsp/lsp-mode@6b6afc00deec -> emacs-lsp/lsp-mode@3fa645c0397b joaotavora/eglot@e835996e1661 -> joaotavora/eglot@bd970be047ab - There are multiple issues in the lsp-mode repo (emacs-lsp/lsp-mode#2722), lsp-julia repo (gdkrmr/lsp-julia#23 and gdkrmr/lsp-julia#35), and the LanguageServer.jl repo (julia-vscode/LanguageServer.jl#844) about crashes of the Julia LSP with lsp-mode due to errors caused by the folding capabilities announced by the client. One can work around these issues by enabling folding (see gdkrmr/lsp-julia#23) but that is only a hack and does not fix the underlying issue. The problem is caused by a violation of the LSP specs in lsp-mode which was fixed in emacs-lsp/lsp-mode#3593. The PR updates lsp-mode to the latest commit on the master branch which contains this fix (and some other unrelated fixes, CI passes successfully again), and hence the workaround for lsp-julia can be removed. Ref: emacs-lsp/lsp-mode#3593 Ref: emacs-lsp/lsp-mode#2722 Ref: gdkrmr/lsp-julia#35 Ref: gdkrmr/lsp-julia#23 Ref: julia-vscode/LanguageServer.jl#844 Close: #6516 Co-authored-by: devmotion --- modules/lang/julia/config.el | 7 +------ modules/tools/lsp/packages.el | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/modules/lang/julia/config.el b/modules/lang/julia/config.el index bd4837c46..1969d6179 100644 --- a/modules/lang/julia/config.el +++ b/modules/lang/julia/config.el @@ -80,12 +80,7 @@ (unless lsp-julia-default-environment (setq lsp-julia-default-environment (or (car (last (doom-glob "~/.julia/environments/v*"))) - "~/.julia/environments/v1.6"))) - :config - ;; See non-Jedi/lsp-julia#35 - (setq-hook! 'julia-mode-hook - lsp-enable-folding t - lsp-folding-range-limit 100)) + "~/.julia/environments/v1.6")))) (use-package! eglot-jl diff --git a/modules/tools/lsp/packages.el b/modules/tools/lsp/packages.el index a3792cce6..e853fb7bc 100644 --- a/modules/tools/lsp/packages.el +++ b/modules/tools/lsp/packages.el @@ -3,11 +3,11 @@ (if (featurep! +eglot) (progn - (package! eglot :pin "e835996e16610d0ded6d862214b3b452b8803ea8") + (package! eglot :pin "bd970be047aba4513c2970b9ff2d842f0472cb0e") (when (featurep! :completion vertico) (package! consult-eglot :pin "0da8801dd8435160ce1f62ad8066bd52e38f5cbd"))) - (package! lsp-mode :pin "6b6afc00deec6dacb78834c02ed5f262e72ce337") - (package! lsp-ui :pin "a0b97db2ada163453c9072d3640202a0b27c29f5") + (package! lsp-mode :pin "3fa645c0397b8f438f2db2dd288b899ba330d410") + (package! lsp-ui :pin "0a6368d38dc32e52abcbd52b63d1e557e42c66e6") (when (featurep! :completion ivy) (package! lsp-ivy :pin "3e87441a625d65ced5a208a0b0442d573596ffa3")) (when (featurep! :completion helm)