fix(rpc)!: preseve files when stdio channel is closed

neovim · Feb 6, 2023 · 9d8f243 · 9d8f243
1 parent 228684d
commit 9d8f243
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/nvim/event/process.c b/src/nvim/event/process.c
@@ -422,7 +422,12 @@ static void exit_event(void **argv)
  }
 
  if (!exiting) {
- os_exit(status);
+ if (ui_client_channel_id) {
+ os_exit(status);
+ } else {
+ assert(status == 0); // Called from rpc_close(), which passes 0 as status.
+ preserve_exit("Vim: stdio RPC channel closed\r\n");
+ }
  }
 }
 

diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
@@ -547,6 +547,9 @@ void rpc_close(Channel *channel)
 
  if (channel->streamtype == kChannelStreamStdio
  || (channel->id == ui_client_channel_id && channel->streamtype != kChannelStreamProc)) {
+ if (channel->streamtype == kChannelStreamStdio) {
+ remote_ui_disconnect(channel->id);
+ }
  exit_from_channel(0);
  }
 }

diff --git a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
@@ -14,7 +14,6 @@ local ok = helpers.ok
 local rmdir = helpers.rmdir
 local new_argv = helpers.new_argv
 local pesc = helpers.pesc
-local os_kill = helpers.os_kill
 local set_session = helpers.set_session
 local spawn = helpers.spawn
 local nvim_async = helpers.nvim_async
@@ -39,8 +38,10 @@ end)
 
 describe(':preserve', function()
  local swapdir = lfs.currentdir()..'/Xtest_recover_dir'
+ local nvim1
  before_each(function()
- clear()
+ nvim1 = spawn(new_argv())
+ set_session(nvim1)
  rmdir(swapdir)
  lfs.mkdir(swapdir)
  end)
@@ -67,7 +68,7 @@ describe(':preserve', function()
 
  local swappath1 = eval('g:swapname')
 
- os_kill(eval('getpid()'))
+ nvim1:close()
  -- Start another Nvim instance.
  local nvim2 = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed'},
  true)