Fix #2408: wrong-number-of-args error on lsp-workspace-restart

Due to a change to lsp--shutdown-workspace upstream.
This commit is contained in:
Henrik Lissner 2020-01-23 01:44:43 -05:00
parent fd41b1b552
commit 1e91c04c04
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -36,14 +36,13 @@ This can be a single company backend or a list thereof. It can be anything
:references 'lsp-find-references) :references 'lsp-find-references)
(defvar +lsp--deferred-shutdown-timer nil) (defvar +lsp--deferred-shutdown-timer nil)
(defadvice! +lsp-defer-server-shutdown-a (orig-fn) (defadvice! +lsp-defer-server-shutdown-a (orig-fn &optional restart)
"Defer server shutdown for a few seconds. "Defer server shutdown for a few seconds.
This gives the user a chance to open other project files before the server is This gives the user a chance to open other project files before the server is
auto-killed (which is usually an expensive process)." auto-killed (which is usually an expensive process)."
:around #'lsp--shutdown-workspace :around #'lsp--shutdown-workspace
(if (or lsp-keep-workspace-alive (if (or lsp-keep-workspace-alive
(eq (lsp--workspace-shutdown-action lsp--cur-workspace) restart)
'restart))
(funcall orig-fn) (funcall orig-fn)
(when (timerp +lsp--deferred-shutdown-timer) (when (timerp +lsp--deferred-shutdown-timer)
(cancel-timer +lsp--deferred-shutdown-timer)) (cancel-timer +lsp--deferred-shutdown-timer))