mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-16 15:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(lsp): support auto-force escalation in client stop (#36378)

Browse Source
This commit is contained in:
Maria Solano
2025-11-01 19:12:29 -07:00
committed by GitHub
parent d847548a1c
commit 02cd564896
4 changed files with 26 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
runtime/lua/vim/lsp.lua
View File

@@ -1132,46 +1132,9 @@ api.nvim_create_autocmd('VimLeavePre', {
callback = function()
local active_clients = lsp.get_clients()
log.info('exit_handler', active_clients)
for _, client in pairs(lsp.client._all) do
client:stop()
end
local timeouts = {} --- @type table<integer,integer>
local max_timeout = 0
local send_kill = false
for client_id, client in pairs(active_clients) do
local timeout = client.flags.exit_timeout
if timeout then
send_kill = true
timeouts[client_id] = timeout
max_timeout = math.max(timeout, max_timeout)
end
end
local poll_time = 50
local function check_clients_closed()
for client_id, timeout in pairs(timeouts) do
timeouts[client_id] = timeout - poll_time
end
for client_id, _ in pairs(active_clients) do
if timeouts[client_id] ~= nil and timeouts[client_id] > 0 then
return false
end
end
return true
end
if send_kill then
if not vim.wait(max_timeout, check_clients_closed, poll_time) then
for client_id, client in pairs(active_clients) do
if timeouts[client_id] ~= nil then
client:stop(true)
end
end
end
for _, client in pairs(active_clients) do
client:stop(client.flags.exit_timeout)
end
end,
})

16
runtime/lua/vim/lsp/client.lua
View File

@@ -865,8 +865,20 @@ end
--- you request to stop a client which has previously been requested to
--- shutdown, it will automatically escalate and force shutdown.
---
--- @param force? boolean
--- If `force` is a number, it will be treated as the time in milliseconds to
--- wait before forcing the shutdown.
---
--- Note: Forcing shutdown while a server is busy writing out project or index
--- files can lead to file corruption.
---
--- @param force? boolean|integer
function Client:stop(force)
if type(force) == 'number' then
vim.defer_fn(function()
self:stop(true)
end, force)
end
local rpc = self.rpc
if rpc.is_closing() then
return
@@ -886,7 +898,7 @@ function Client:stop(force)
if err == nil then
rpc.notify('exit')
else
-- If there was an error in the shutdown request, then term to be safe.
-- If there was an error in the shutdown request, then terminate to be safe.
rpc.terminate()
self._graceful_shutdown_failed = true
end