GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 09:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): ensure watcher cancel

Browse Source 
* Cancel watcher in the "force" case.
* Cancel watcher outside the async callback. It seems nvim doesn't wait
  async jobs on quitting, leaving detached inotifywait processes.
* Clean up cancelling callbacks.
This commit is contained in:
Jaehwang Jung
2025-01-02 17:33:16 +09:00
committed by Lewis Russell
parent efe1732c6f
commit 9d9ee3476e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/lua/vim/lsp/_watchfiles.lua
View File

@ -174,6 +174,7 @@ function M.cancel(client_id)
cancel() cancel()
end end
end end
cancels[client_id] = nil
end end
return M return M

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

@ -805,6 +805,8 @@ function Client:stop(force)
return return
end end
vim.lsp._watchfiles.cancel(self.id)
if force or not self.initialized or self._graceful_shutdown_failed then if force or not self.initialized or self._graceful_shutdown_failed then
rpc.terminate() rpc.terminate()
return return
@ -819,7 +821,6 @@ function Client:stop(force)
rpc.terminate() rpc.terminate()
self._graceful_shutdown_failed = true self._graceful_shutdown_failed = true
end end
vim.lsp._watchfiles.cancel(self.id)
end) end)
end end