fix(lua): vim._with() doesn't save boolean options properly (#37354)

zeertzjq · github-actions[bot] · commit f21c169a025b · 2026-01-11T12:30:12.000Z
Problem: vim._with() doesn't save boolean options with false values properly. Solution: Use vim.F.if_nil(). (cherry picked from commit 94144d4)
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
@@ -1277,13 +1277,13 @@ local get_context_state = function(context)
 
       -- Do not override already set state and fall back to `vim.NIL` for
       -- state `nil` values (which still needs restoring later)
-      res[sc][name] = res[sc][name] or vim[sc][name] or vim.NIL
+      res[sc][name] = vim.F.if_nil(res[sc][name], vim[sc][name], vim.NIL)
 
       -- Always track global option value to properly restore later.
       -- This matters for at least `o` and `wo` (which might set either/both
       -- local and global option values).
-      if sc ~= 'env' then
-        res.go[name] = res.go[name] or vim.go[name]
+      if sc ~= 'env' and res.go[name] == nil then
+        res.go[name] = vim.go[name]
       end
     end
   end
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
@@ -529,7 +529,7 @@ static void chan_close_on_err(Channel *channel, char *msg, int loglevel)
   for (size_t i = 0; i < kv_size(channel->rpc.call_stack); i++) {
     ChannelCallFrame *frame = kv_A(channel->rpc.call_stack, i);
     if (frame->returned) {
-      continue;  // Don't overwrite an already received result.
+      continue;  // Don't overwrite an already received result. #24214
     }
     frame->returned = true;
     frame->errored = true;
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua
@@ -396,7 +396,7 @@ describe('server -> client', function()
       eq({}, api.nvim_get_chan_info(id)) -- Channel is closed.
     end)
 
-    it('response works with channel closed just after response', function()
+    it('response works with channel closed just after response #24214', function()
       local id = start_server_and_client()
       eq(
         'RESPONSE',
diff --git a/test/functional/lua/with_spec.lua b/test/functional/lua/with_spec.lua

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ static void chan_close_on_err(Channel channel, char msg, int loglevel)`
`529`	`529`	`for (size_t i = 0; i < kv_size(channel->rpc.call_stack); i++) {`
`530`	`530`	`ChannelCallFrame *frame = kv_A(channel->rpc.call_stack, i);`
`531`	`531`	`if (frame->returned) {`
`532`		`- continue; // Don't overwrite an already received result.`
	`532`	`+ continue; // Don't overwrite an already received result. #24214`
`533`	`533`	`}`
`534`	`534`	`frame->returned = true;`
`535`	`535`	`frame->errored = true;`