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

lsp: allow launching language servers with uv_spawn using cwd arg

Browse Source
This commit is contained in:
Michael Lingelbach
2021-04-01 12:39:33 -07:00
parent 3d25a72a60
commit 3b01dd4183
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,8 +315,10 @@ local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
dispatchers = { dispatchers, 't', true }; dispatchers = { dispatchers, 't', true };
} }
if not (vim.fn.executable(cmd) == 1) then if extra_spawn_params and extra_spawn_params.cwd then
error(string.format("The given command %q is not executable.", cmd)) assert(is_dir(extra_spawn_params.cwd), "cwd must be a directory")
elseif not (vim.fn.executable(cmd) == 1) then
error(string.format("The given command %q is not executable.", cmd))
end end
if dispatchers then if dispatchers then
local user_dispatchers = dispatchers local user_dispatchers = dispatchers
@@ -370,9 +372,6 @@ local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
} }
if extra_spawn_params then if extra_spawn_params then
spawn_params.cwd = extra_spawn_params.cwd spawn_params.cwd = extra_spawn_params.cwd
if spawn_params.cwd then
assert(is_dir(spawn_params.cwd), "cwd must be a directory")
end
spawn_params.env = env_merge(extra_spawn_params.env) spawn_params.env = env_merge(extra_spawn_params.env)
end end
handle, pid = uv.spawn(cmd, spawn_params, onexit) handle, pid = uv.spawn(cmd, spawn_params, onexit)