mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-02 13:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(restart): keep :restart error message concise #40746

Browse Source 
(cherry picked from commit 4f1ef2dec1)
This commit is contained in:
Olivia Kinnear
2026-07-15 18:05:46 -05:00
parent 3a0e6239e9
commit a198506815
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/lua/vim/_core/server.lua
View File

@@ -149,8 +149,16 @@ function M.ex_session_restart(after_cmd, quit_cmd)
end)
if not success then
--- @cast msg string
fs.rm(session, { force = true })
error(msg)
-- Trim error message to be equivalent to `:restart!`
local trimmed_msg = msg:match('Vim:.*$')
if trimmed_msg then
vim.api.nvim_echo({ { trimmed_msg:sub(5) } }, true, { err = true })
else
error(msg)
end
end
end

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

@@ -520,16 +520,18 @@ describe('TUI :restart', function()
assert_exitreason()
assert_termguicolors_and_no_gui_running()
-- Check ":restart! +echo" cannot restart server.
-- Check ":restart[!] +echo" cannot restart server.
-- Check the full screen state to ensure this doesn't pollute the current UI.
tt.feed_data(':restart! +echo\013')
screen:expect([[
^ |
{1:~}{18: }|*3
{3:[No Name] }|
{9:restart failed: +cmd did not quit the server} |
{5:-- TERMINAL --} |
]])
for _, cmd in ipairs({ ':restart', ':restart!' }) do
tt.feed_data(cmd .. ' +echo\013')
screen:expect([[
^ |
{1:~}{18: }|*3
{3:[No Name] }|
{9:restart failed: +cmd did not quit the server} |
{5:-- TERMINAL --} |
]])
end
tt.feed_data('ithis will be removed\027')
screen:expect({ any = vim.pesc('this will be remove^d') })
@@ -567,11 +569,13 @@ describe('TUI :restart', function()
tt.feed_data(':confirm restart! +echo\013')
screen:expect({ any = vim.pesc('+cmd did not quit the server') })
-- Check ":restart!" on a modified buffer.
-- Check ":restart[!]" on a modified buffer.
tt.feed_data('ithis will be removed\027')
tt.feed_data(':restart!\013')
screen:expect({ any = vim.pesc('Vim(qall):E37: No write since last change') })
assert_exitreason('QuitPre:restart\nExitPre:restart\n')
for _, cmd in ipairs({ ':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')
end
-- Check ":restart! +qall!" on a modified buffer.
tt.feed_data('ithis will be removed\027')