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 <birdee@localhost>

1 files changed, 4 insertions, 6 deletions

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<string,string|number>
+    env = vim.tbl_extend('force', base_env(), env or {})
   end
 
-  --- @type table<string,string|number>
-  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