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

fix(messages): don't set cmdline_row when messages have scrolled (#21015)

Browse Source 
When 'cmdheight' is changed while messages have scrolled, the position
of msg_grid is not moved up, so cmdline_row should not be set based on
the position of msg_grid.
This commit is contained in:
zeertzjq
2022-11-11 16:46:45 +08:00
committed by GitHub
parent ae67706535
commit fc7ac688c3
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/message.c
View File

@@ -196,7 +196,7 @@ void msg_grid_validate(void)
msg_grid_set_pos(max_rows, false);
}
if (msg_grid.chars && cmdline_row < msg_grid_pos) {
if (msg_grid.chars && !msg_scrolled && cmdline_row < msg_grid_pos) {
// TODO(bfredl): this should already be the case, but fails in some
// "batched" executions where compute_cmdrow() use stale positions or
// something.

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

@@ -1236,6 +1236,34 @@ vimComment xxx match /\s"[^\-:.%#=*].*$/ms=s+1,lc=1 excludenl contains=@vim
bar^ |
]])
end)
it('consecutive calls to win_move_statusline() work after multiline message #21014',function()
async_meths.exec([[
echo "\n"
call win_move_statusline(0, -4)
call win_move_statusline(0, 4)
]], false)
screen:expect([[
|
{1:~ }|
{1:~ }|
{1:~ }|
{3: }|
|
{4:Press ENTER or type command to continue}^ |
]])
feed('<CR>')
screen:expect([[
^ |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]])
eq(1, meths.get_option('cmdheight'))
end)
end)
it('calling screenstring() after redrawing between messages without UI #20999', function()