mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 14:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(message): no wait return for delayed exception error #35881

Browse Source 
Problem:  Wait return for delayed exception error message.
Solution: Check that error was actually shown.
This commit is contained in:
luukvbaal
2025-09-23 22:35:08 +02:00
committed by GitHub
parent ccf020d0f3
commit 3d5ef97a98
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/ex_cmds2.c
View File

@@ -388,10 +388,12 @@ bool check_changed_any(bool hidden, bool unload)
msg_col = 0; msg_col = 0;
msg_didout = false; msg_didout = false;
} }
if ((buf->terminal && channel_job_running((uint64_t)buf->b_p_channel)) if (((buf->terminal && channel_job_running((uint64_t)buf->b_p_channel))
? semsg(_("E947: Job still running in buffer \"%s\""), buf->b_fname) ? semsg(_("E947: Job still running in buffer \"%s\""), buf->b_fname)
: semsg(_("E162: No write since last change for buffer \"%s\""), : semsg(_("E162: No write since last change for buffer \"%s\""),
buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname)) { buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname))
// Only makes sense if error is shown, which cause_errthrow() may prevent.
&& msg_didany) {
int save = no_wait_return; int save = no_wait_return;
no_wait_return = false; no_wait_return = false;
wait_return(false); wait_return(false);

10
test/functional/ui/messages_spec.lua
View File

@@ -2053,6 +2053,16 @@ vimComment xxx match /\s"[^\-:.%#=*].*$/ms=s+1,lc=1 excludenl contains=@vim
feed('<CR>') feed('<CR>')
assert_alive() assert_alive()
end) end)
it('no wait return before delayed exception error message', function()
feed('ia<esc>:lua vim.cmd.quit()<CR>')
screen:expect({
any = {
'{9:.*Vim:E37: No write since.*}',
'{6:Press ENTER or type command to continue}^',
},
})
end)
end) end)
it('calling screenstring() after redrawing between messages without UI #20999', function() it('calling screenstring() after redrawing between messages without UI #20999', function()