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

Remove trailing slash on lsp-server-install-dir

Browse source 
Fixes some issues with lsp-mode's downloader resolving paths to
downloaded assets. For example, lua-language-server fails to download
when lsp-server-install-dir has a trailing slash (see #4846).

Fix #4846
This commit is contained in:
Henrik Lissner 2021-04-15 01:21:07 -04:00
parent c0c42ad0b0
commit c77cebfef8
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ about it (it will be logged to *Messages* however).")
:init :init
;; Don't touch ~/.emacs.d, which could be purged without warning ;; Don't touch ~/.emacs.d, which could be purged without warning
(setq lsp-session-file (concat doom-etc-dir "lsp-session") (setq lsp-session-file (concat doom-etc-dir "lsp-session")
lsp-server-install-dir (concat doom-etc-dir "lsp/")) lsp-server-install-dir (concat doom-etc-dir "lsp"))
;; Don't auto-kill LSP server after last workspace buffer is killed, because I ;; Don't auto-kill LSP server after last workspace buffer is killed, because I
;; will do it for you, after `+lsp-defer-shutdown' seconds. ;; will do it for you, after `+lsp-defer-shutdown' seconds.
(setq lsp-keep-workspace-alive nil) (setq lsp-keep-workspace-alive nil)
@ -47,11 +47,12 @@ about it (it will be logged to *Messages* however).")
(pushnew! doom-debug-variables 'lsp-log-io 'lsp-print-performance) (pushnew! doom-debug-variables 'lsp-log-io 'lsp-print-performance)
(setq lsp-intelephense-storage-path (concat doom-etc-dir "lsp-intelephense/") (setq lsp-intelephense-storage-path (concat doom-etc-dir "lsp-intelephense/")
lsp-vetur-global-snippets-dir (expand-file-name "vetur" lsp-vetur-global-snippets-dir
(or (bound-and-true-p +snippets-dir) (expand-file-name
(concat doom-private-dir "snippets/"))) "vetur" (or (bound-and-true-p +snippets-dir)
lsp-xml-jar-file (concat lsp-server-install-dir "org.eclipse.lsp4xml-0.3.0-uber.jar") (concat doom-private-dir "snippets/")))
lsp-groovy-server-file (concat lsp-server-install-dir "groovy-language-server-all.jar")) lsp-xml-jar-file (expand-file-name "org.eclipse.lsp4xml-0.3.0-uber.jar" lsp-server-install-dir)
lsp-groovy-server-file (expand-file-name "groovy-language-server-all.jar" lsp-server-install-dir))
(set-popup-rule! "^\\*lsp-help" :size 0.35 :quit t :select t) (set-popup-rule! "^\\*lsp-help" :size 0.35 :quit t :select t)
(set-lookup-handlers! 'lsp-mode (set-lookup-handlers! 'lsp-mode