mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-11 17:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ex_cmds): consistent :restart behavior (#36723)

Browse Source
This commit is contained in:
Olivia Kinnear
2025-11-30 05:14:28 -05:00
committed by GitHub
parent c87d92c3b4
commit 12d4c624bb
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/doc/gui.txt
View File

@@ -73,25 +73,23 @@ Restart Nvim
:restart [+cmd] [command] :restart [+cmd] [command]
Restarts Nvim. Restarts Nvim.
1. Stops Nvim using `:qall!` (or |+cmd|, if given). 1. Stops Nvim using `:qall` (or |+cmd|, if given).
2. Starts a new Nvim server using the same |v:argv|, 2. Starts a new Nvim server using the same |v:argv|,
optionally running [command] at startup. |-c| optionally running [command] at startup. |-c|
3. Attaches the current UI to the new Nvim server. Other UIs 3. Attaches the current UI to the new Nvim server. Other UIs
(if any) will not reattach on restart (this may change in (if any) will not reattach on restart (this may change in
the future). the future).
Use with `:confirm` to prompt if changes have been made. Example: discard changes and stop with `:qall!`, then restart: >
Example: stop with `:qall!`, then restart: >
:restart +qall! :restart +qall!
< Example: restart and restore the current session: > < Example: restart and restore the current session: >
:mksession! Session.vim | restart source Session.vim :mksession! Session.vim | restart source Session.vim
< Example: restart and update plugins: > < Example: restart and update plugins: >
:restart +qall! lua vim.pack.update() :restart lua vim.pack.update()
< <
Note: Only works if the UI and server are on the same system. Note: Only works if the UI and server are on the same system.
Note: If the UI hasn't implemented the "restart" UI event, Note: If the UI hasn't implemented the "restart" UI event,
this command is equivalent to `:qall!`. this command is equivalent to `:qall` (or |+cmd|, if given).
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
Connect UI to a different server Connect UI to a different server

18
src/nvim/ex_docmd.c
View File

@@ -4906,23 +4906,19 @@ static void ex_restart(exarg_T *eap)
set_vim_var_list(VV_ARGV, argv_cpy); set_vim_var_list(VV_ARGV, argv_cpy);
} }
bool confirm = (p_confirm || (cmdmod.cmod_flags & CMOD_CONFIRM)); char *quit_cmd = (eap->do_ecmd_cmd) ? eap->do_ecmd_cmd : "qall";
if (confirm && check_changed_any(false, false)) { char *quit_cmd_copy = NULL;
return;
}
char *quit_cmd; // Prepend "confirm " to cmd if :confirm is used
if (eap->do_ecmd_cmd) { if (cmdmod.cmod_flags & CMOD_CONFIRM) {
quit_cmd = eap->do_ecmd_cmd; quit_cmd_copy = concat_str("confirm ", quit_cmd);
} else if (confirm) { quit_cmd = quit_cmd_copy;
quit_cmd = "qall";
} else {
quit_cmd = "qall!";
} }
Error err = ERROR_INIT; Error err = ERROR_INIT;
restarting = true; restarting = true;
nvim_command(cstr_as_string(quit_cmd), &err); nvim_command(cstr_as_string(quit_cmd), &err);
xfree(quit_cmd_copy);
if (ERROR_SET(&err)) { if (ERROR_SET(&err)) {
emsg(err.msg); // Could not exit emsg(err.msg); // Could not exit
api_clear_error(&err); api_clear_error(&err);

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

@@ -351,8 +351,8 @@ describe('TUI :restart', function()
restart_pid_check() restart_pid_check()
gui_running_check() gui_running_check()
-- Check ":restart +qall" on an unmodified buffer. -- Check ":restart +qall!" on an unmodified buffer.
tt.feed_data(':restart +qall\013') tt.feed_data(':restart +qall!\013')
screen_expect(s0) screen_expect(s0)
restart_pid_check() restart_pid_check()
gui_running_check() gui_running_check()
@@ -397,8 +397,18 @@ describe('TUI :restart', function()
restart_pid_check() restart_pid_check()
gui_running_check() gui_running_check()
-- Check ":restart" on the modified buffer. -- Check ":confirm restart +echo" correctly ignores ":confirm"
tt.feed_data(':confirm restart +echo\013')
screen:expect({ any = vim.pesc('+cmd did not quit the server') })
-- Check ":restart" on a modified buffer.
tt.feed_data('ithis will be removed\027')
tt.feed_data(':restart\013') tt.feed_data(':restart\013')
screen:expect({ any = vim.pesc('Vim(qall):E37: No write since last change') })
-- Check ":restart +qall!" on a modified buffer.
tt.feed_data('ithis will be removed\027')
tt.feed_data(':restart +qall!\013')
screen_expect(s0) screen_expect(s0)
restart_pid_check() restart_pid_check()
gui_running_check() gui_running_check()
@@ -3979,7 +3989,7 @@ describe('TUI client', function()
-- Run :restart on the remote client. -- Run :restart on the remote client.
-- The remote client should start a new server while the original one should exit. -- The remote client should start a new server while the original one should exit.
feed_data(':restart\n') feed_data(':restart +qall!\n')
screen_client:expect([[ screen_client:expect([[
^ | ^ |
{100:~ }|*3 {100:~ }|*3
@@ -4081,7 +4091,7 @@ describe('TUI client', function()
-- Run :restart on the client. -- Run :restart on the client.
-- The client should start a new server while the original server should exit. -- The client should start a new server while the original server should exit.
feed_data(':restart\n') feed_data(':restart +qall!\n')
screen_client:expect([[ screen_client:expect([[
^ | ^ |
{100:~ }|*4 {100:~ }|*4