mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-05-04 13:05:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14429 from ckipp01/force

Browse Source 
[LSP] - Don't automatically force shutdown on second restart.
This commit is contained in:
Michael Lingelbach
2021-04-23 14:52:13 -07:00
committed by GitHub
parent 8885ea7f24 2a77d9d8a4
commit 11728988dc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -916,7 +916,7 @@ function lsp.start_client(config)
-- Track this so that we can escalate automatically if we've alredy tried a
-- graceful shutdown
local tried_graceful_shutdown = false
local graceful_shutdown_failed = false
--@private
--- Stops a client, optionally with force.
---
@@ -938,11 +938,10 @@ function lsp.start_client(config)
if handle:is_closing() then
return
end
if force or (not client.initialized) or tried_graceful_shutdown then
if force or (not client.initialized) or graceful_shutdown_failed then
handle:kill(15)
return
end
tried_graceful_shutdown = true
-- Sending a signal after a process has exited is acceptable.
rpc.request('shutdown', nil, function(err, _)
if err == nil then
@@ -950,6 +949,7 @@ function lsp.start_client(config)
else
-- If there was an error in the shutdown request, then term to be safe.
handle:kill(15)
graceful_shutdown_failed = true
end
end)
end