diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/nvim-lsp-installer/process.lua | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lua/nvim-lsp-installer/process.lua b/lua/nvim-lsp-installer/process.lua index d10f5974..ae3647cb 100644 --- a/lua/nvim-lsp-installer/process.lua +++ b/lua/nvim-lsp-installer/process.lua @@ -21,19 +21,21 @@ local function connect_sink(pipe, sink) end end +-- We gather the root env immediately, primarily because of E5560. +-- Also, there's no particular reason we need to refresh the environment (yet). +local initial_environ = vim.fn.environ() + function M.extend_path(new_paths) - local environ = vim.loop.os_environ() local new_path_str = table.concat(new_paths, platform.path_sep) - if environ["PATH"] then - return new_path_str .. platform.path_sep .. environ["PATH"] + if initial_environ["PATH"] then + return new_path_str .. platform.path_sep .. initial_environ["PATH"] end return new_path_str end function M.graft_env(env) - local base_env = vim.loop.os_environ() local merged_env = {} - for key, val in pairs(base_env) do + for key, val in pairs(initial_environ) do if env[key] == nil then merged_env[#merged_env + 1] = key .. "=" .. val end @@ -181,8 +183,8 @@ end function M.simple_sink() return { - stdout = vim.schedule_wrap(vim.api.nvim_out_write), - stderr = vim.schedule_wrap(vim.api.nvim_err_write), + stdout = vim.schedule_wrap(print), + stderr = vim.schedule_wrap(vim.api.nvim_err_writeln), } end |