From 731e616a79d01e4797badbb4e18d167c51125151 Mon Sep 17 00:00:00 2001 From: Birdee <85372418+BirdeeHub@users.noreply.github.com> Date: Wed, 25 Jun 2025 15:15:19 -0700 Subject: fix(vim.system): clear_env=true gives an invalid env to uv.spawn #33955 Problem: In setup_env, some needed logic is bypassed when clear_env=true. Solution: Drop the early return in setup_env(). Co-authored-by: BirdeeHub --- runtime/lua/vim/_system.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'runtime/lua/vim/_system.lua') diff --git a/runtime/lua/vim/_system.lua b/runtime/lua/vim/_system.lua index 23a32fbd49..38e348bc03 100644 --- a/runtime/lua/vim/_system.lua +++ b/runtime/lua/vim/_system.lua @@ -208,15 +208,13 @@ end --- @param clear_env? boolean --- @return string[]? local function setup_env(env, clear_env) - if clear_env then - return env + if not clear_env then + --- @type table + env = vim.tbl_extend('force', base_env(), env or {}) end - --- @type table - env = vim.tbl_extend('force', base_env(), env or {}) - local renv = {} --- @type string[] - for k, v in pairs(env) do + for k, v in pairs(env or {}) do renv[#renv + 1] = string.format('%s=%s', k, tostring(v)) end -- cgit v1.3-3-g829e