mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-24 03:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): restore Client:stop() force-stopping behavior (#35800)

Browse Source 
This fixes a regression from #33796.

I tried for several hours and cannot write a working test for this, but
this does fix the following warning in tests run with ASAN or TSAN:

    -------- Running tests from test/functional/plugin/lsp_spec.lua
    RUN      T4667 LSP server_name specified start_client(), stop_client(): 114.00 ms OK
    RUN      T4668 LSP server_name specified stop_client() also works on client objects: 97.00 ms OK
    RUN      T4669 LSP server_name specified does not reuse an already-stopping client #33616: 31.00 ms OK
    nvim took 2022 milliseconds to exit after last test
    This indicates a likely problem with the test even if it passed!

(cherry picked from commit 4ef5624729)
This commit is contained in:
zeertzjq
2025-09-17 08:56:09 +08:00
committed by github-actions[bot]
parent d86658f9d9
commit eb4837206a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -806,12 +806,12 @@ end
--- ---
--- @param force? boolean --- @param force? boolean
function Client:stop(force) function Client:stop(force)
if self:is_stopped() then local rpc = self.rpc
if rpc.is_closing() then
return return
end end
self._is_stopping = true self._is_stopping = true
local rpc = self.rpc
vim.lsp._watchfiles.cancel(self.id) vim.lsp._watchfiles.cancel(self.id)