mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): detach spawned LSP server processes (#18477)

Browse Source 
LSP servers should be daemonized (detached) so that they run in a
separate process group from Neovim's. Among other things, this ensures
the process does not inherit Neovim's TTY (#18475).

Make this configurable so that clients can explicitly opt-out of
detaching from Nvim.
This commit is contained in:
Gregory Anders
2022-05-08 13:00:30 -06:00
committed by GitHub
parent 0d3f17a6c3
commit 6cfb1d4c28
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/doc/lsp.txt
View File

@@ -787,6 +787,13 @@ start_client({config}) *vim.lsp.start_client()*
{ "PRODUCTION=true"; "TEST=123"; PORT = 8080; HOST = "0.0.0.0"; } { "PRODUCTION=true"; "TEST=123"; PORT = 8080; HOST = "0.0.0.0"; }
< <
{detached} (boolean, default true) Daemonize the
server process so that it runs in a
separate process group from Nvim.
Nvim will shutdown the process on
exit, but if Nvim fails to exit
cleanly this could leave behind
orphaned server processes.
{workspace_folders} (table) List of workspace folders {workspace_folders} (table) List of workspace folders
passed to the language server. For passed to the language server. For
backwards compatibility rootUri and backwards compatibility rootUri and

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

@@ -241,6 +241,7 @@ local function validate_client_config(config)
capabilities = { config.capabilities, "t", true }; capabilities = { config.capabilities, "t", true };
cmd_cwd = { config.cmd_cwd, optional_validator(is_dir), "directory" }; cmd_cwd = { config.cmd_cwd, optional_validator(is_dir), "directory" };
cmd_env = { config.cmd_env, "t", true }; cmd_env = { config.cmd_env, "t", true };
detached = { config.detached, "b", true };
name = { config.name, 's', true }; name = { config.name, 's', true };
on_error = { config.on_error, "f", true }; on_error = { config.on_error, "f", true };
on_exit = { config.on_exit, "f", true }; on_exit = { config.on_exit, "f", true };
@@ -663,6 +664,10 @@ end
--- { "PRODUCTION=true"; "TEST=123"; PORT = 8080; HOST = "0.0.0.0"; } --- { "PRODUCTION=true"; "TEST=123"; PORT = 8080; HOST = "0.0.0.0"; }
--- </pre> --- </pre>
--- ---
---@param detached: (boolean, default true) Daemonize the server process so that it runs in a
--- separate process group from Nvim. Nvim will shutdown the process on exit, but if Nvim fails to
--- exit cleanly this could leave behind orphaned server processes.
---
---@param workspace_folders (table) List of workspace folders passed to the ---@param workspace_folders (table) List of workspace folders passed to the
--- language server. For backwards compatibility rootUri and rootPath will be --- language server. For backwards compatibility rootUri and rootPath will be
--- derived from the first workspace folder in this list. See `workspaceFolders` in --- derived from the first workspace folder in this list. See `workspaceFolders` in
@@ -859,6 +864,7 @@ function lsp.start_client(config)
local rpc = lsp_rpc.start(cmd, cmd_args, dispatch, { local rpc = lsp_rpc.start(cmd, cmd_args, dispatch, {
cwd = config.cmd_cwd; cwd = config.cmd_cwd;
env = config.cmd_env; env = config.cmd_env;
detached = config.detached;
}) })
-- Return nil if client fails to start -- Return nil if client fails to start

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

@@ -319,10 +319,14 @@ local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
local spawn_params = { local spawn_params = {
args = cmd_args; args = cmd_args;
stdio = {stdin, stdout, stderr}; stdio = {stdin, stdout, stderr};
detached = true;
} }
if extra_spawn_params then if extra_spawn_params then
spawn_params.cwd = extra_spawn_params.cwd spawn_params.cwd = extra_spawn_params.cwd
spawn_params.env = env_merge(extra_spawn_params.env) spawn_params.env = env_merge(extra_spawn_params.env)
if extra_spawn_params.detached ~= nil then
spawn_params.detached = extra_spawn_params.detached
end
end end
handle, pid = uv.spawn(cmd, spawn_params, onexit) handle, pid = uv.spawn(cmd, spawn_params, onexit)
if handle == nil then if handle == nil then