mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-22 17:02:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(restart): distinguish v:exitreason for :restart! #40801

Browse Source
This commit is contained in:
Barrett Ruth
2026-07-18 03:07:14 -05:00
committed by GitHub
parent 28818702e9
commit 12e8db3847
5 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/doc/vvars.txt
View File

@@ -242,6 +242,7 @@ v:exitreason
- "" Not exiting, or exit was canceled.
- "quit" |:quit|, |:qall|, |:wq|, |ZZ|, |ZQ|, etc.
- "restart" |:restart|, |ZR|.
- "restart!" |:restart!|, |[count]||ZR|.
Example: >vim
autocmd ExitPre * if v:exitreason ==# 'restart' | echomsg 'restarting' | endif

1
runtime/lua/vim/_meta/vvars.gen.lua generated
View File

@@ -256,6 +256,7 @@ vim.v.exiting = ...
--- - "" Not exiting, or exit was canceled.
--- - "quit" `:quit`, `:qall`, `:wq`, `ZZ`, `ZQ`, etc.
--- - "restart" `:restart`, `ZR`.
--- - "restart!" `:restart!`, `[count]``ZR`.
---
--- Example:
---

2
src/nvim/ex_docmd.c
View File

@@ -5172,7 +5172,7 @@ static void ex_restart(exarg_T *eap)
ui_flush();
xfree(listen_addr);
set_vim_var_string(VV_EXITREASON, S_LEN("restart"));
set_vim_var_string(VV_EXITREASON, startreason, -1);
char *quit_cmd_copy = NULL;

1
src/nvim/vvars.lua
View File

@@ -282,6 +282,7 @@ M.vars = {
- "" Not exiting, or exit was canceled.
- "quit" |:quit|, |:qall|, |:wq|, |ZZ|, |ZQ|, etc.
- "restart" |:restart|, |ZR|.
- "restart!" |:restart!|, |[count]||ZR|.
Example: >vim
autocmd ExitPre * if v:exitreason ==# 'restart' | echomsg 'restarting' | endif

21
test/functional/terminal/tui_spec.lua
View File

@@ -498,7 +498,8 @@ describe('TUI :restart', function()
end)
local function assert_exitreason(expected)
local default = 'QuitPre:restart\nExitPre:restart\nVimLeavePre:restart\nVimLeave:restart\n'
local default =
'QuitPre:restart!\nExitPre:restart!\nVimLeavePre:restart!\nVimLeave:restart!\n'
eq(expected or default, t.read_file(eventlog))
os.remove(eventlog)
end
@@ -565,6 +566,13 @@ describe('TUI :restart', function()
{5:-- TERMINAL --} |
]]
tt.feed_data(':set nomodified\013')
tt.feed_data(':restart\013')
screen:expect(s0)
assert_new_pid()
assert_exitreason('QuitPre:restart\nExitPre:restart\nVimLeavePre:restart\nVimLeave:restart\n')
assert_termguicolors_and_no_gui_running()
tt.feed_data(':set nomodified\013')
-- Command is run on new server.
tt.feed_data(":restart! put ='Hello1'\013")
@@ -630,7 +638,7 @@ describe('TUI :restart', function()
tt.feed_data('C\013')
screen:expect({ any = vim.pesc('[No Name]') })
-- Failed/cancelled restarts still fire QuitPre/ExitPre (but not VimLeave[Pre]).
assert_exitreason('QuitPre:restart\nExitPre:restart\n')
assert_exitreason('QuitPre:restart!\nExitPre:restart!\n')
-- Check :restart! respects 'confirm' option.
tt.feed_data(':set confirm\013')
@@ -640,7 +648,7 @@ describe('TUI :restart', function()
screen:expect({ any = vim.pesc('[No Name]') })
tt.feed_data(':set noconfirm\013')
-- Failed/cancelled restarts still fire QuitPre/ExitPre (but not VimLeave[Pre]).
assert_exitreason('QuitPre:restart\nExitPre:restart\n')
assert_exitreason('QuitPre:restart!\nExitPre:restart!\n')
-- Check ":confirm restart! <cmd>" on a modified buffer.
tt.feed_data(":confirm restart! put ='Hello3'\013")
@@ -657,10 +665,13 @@ describe('TUI :restart', function()
-- Check ":restart[!]" on a modified buffer.
tt.feed_data('ithis will be removed\027')
for _, cmd in ipairs({ ':restart', ':restart!' }) do
for cmd, exitreason in pairs({
[':restart'] = 'restart',
[':restart!'] = 'restart!',
}) do
tt.feed_data(cmd .. '\013')
screen:expect({ any = vim.pesc('Vim(qall):E37: No write since last change') })
assert_exitreason('QuitPre:restart\nExitPre:restart\n')
assert_exitreason(('QuitPre:%s\nExitPre:%s\n'):format(exitreason, exitreason))
end
-- Check ":restart! +qall!" on a modified buffer.