Skip to content

Commit

Permalink
fix(sleep): correct cursor placement (neovim#22639)
Browse files Browse the repository at this point in the history 
Just setcursor_mayforce(true) is enough as Nvim uses msg_grid.
  • Loading branch information
@zeertzjq
zeertzjq committed Mar 12, 2023
1 parent 714f6bf commit 1c4b3d4
Show file tree
Hide file tree
Showing 3 changed files with 275 additions and 7 deletions.
5 changes: 1 addition & 4 deletions src/nvim/ex_docmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5666,10 +5666,7 @@ static void ex_equal(exarg_T *eap)
static void ex_sleep(exarg_T *eap)
{
if (cursor_valid()) {
int n = curwin->w_winrow + curwin->w_wrow - msg_scrolled;
if (n >= 0) {
ui_cursor_goto(n, curwin->w_wincol + curwin->w_wcol);
}
setcursor_mayforce(true);
}

long len = eap->line2;
Expand Down
3 changes: 1 addition & 2 deletions src/nvim/move.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,7 @@ void approximate_botline_win(win_T *wp)
int cursor_valid(void)
{
check_cursor_moved(curwin);
return (curwin->w_valid & (VALID_WROW|VALID_WCOL)) ==
(VALID_WROW|VALID_WCOL);
return (curwin->w_valid & (VALID_WROW|VALID_WCOL)) == (VALID_WROW|VALID_WCOL);
}

// Validate cursor position. Makes sure w_wrow and w_wcol are valid.
Expand Down
274 changes: 273 additions & 1 deletion test/functional/ui/float_spec.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8909,7 +8909,6 @@ describe('float window', function()
]], win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
}}

else
screen:expect{grid=[[
^ |
Expand Down Expand Up @@ -8952,6 +8951,279 @@ describe('float window', function()
test_float_move_close('autocmd BufWinLeave * ++once redraw')
end)
end)

it(':sleep cursor placement #22639', function()
local float_opts = {relative = 'editor', row = 1, col = 1, width = 4, height = 3}
local win = meths.open_win(meths.create_buf(false, false), true, float_opts)
feed('iab<CR>cd<Esc>')
feed(':sleep 100')
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[3:----------------------------------------]|
## grid 2
|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
:sleep 100^ |
## grid 4
{1:ab }|
{1:cd }|
{2:~ }|
]], float_pos={
[4] = {{id = 1001}, "NW", 1, 1, 1, true, 50};
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
[4] = {win = {id = 1001}, topline = 0, botline = 3, curline = 1, curcol = 1, linecount = 2};
}}
else
screen:expect{grid=[[
|
{0:~}{1:ab }{0: }|
{0:~}{1:cd }{0: }|
{0:~}{2:~ }{0: }|
{0:~ }|
{0:~ }|
:sleep 100^ |
]]}
end

feed('<CR>')
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[3:----------------------------------------]|
## grid 2
|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
:sleep 100 |
## grid 4
{1:ab }|
{1:c^d }|
{2:~ }|
]], float_pos={
[4] = {{id = 1001}, "NW", 1, 1, 1, true, 50};
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
[4] = {win = {id = 1001}, topline = 0, botline = 3, curline = 1, curcol = 1, linecount = 2};
}}
else
screen:expect{grid=[[
|
{0:~}{1:ab }{0: }|
{0:~}{1:c^d }{0: }|
{0:~}{2:~ }{0: }|
{0:~ }|
{0:~ }|
:sleep 100 |
]]}
end
feed('<C-C>')
screen:expect_unchanged()

meths.win_set_config(win, {border = 'single'})
feed(':sleep 100')
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[3:----------------------------------------]|
## grid 2
|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
:sleep 100^ |
## grid 4
{5:┌────┐}|
{5:│}{1:ab }{5:│}|
{5:│}{1:cd }{5:│}|
{5:│}{2:~ }{5:│}|
{5:└────┘}|
]], float_pos={
[4] = {{id = 1001}, "NW", 1, 1, 1, true, 50};
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
[4] = {win = {id = 1001}, topline = 0, botline = 3, curline = 1, curcol = 1, linecount = 2};
}}
else
screen:expect{grid=[[
|
{0:~}{5:┌────┐}{0: }|
{0:~}{5:│}{1:ab }{5:│}{0: }|
{0:~}{5:│}{1:cd }{5:│}{0: }|
{0:~}{5:│}{2:~ }{5:│}{0: }|
{0:~}{5:└────┘}{0: }|
:sleep 100^ |
]]}
end

feed('<CR>')
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[3:----------------------------------------]|
## grid 2
|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
:sleep 100 |
## grid 4
{5:┌────┐}|
{5:│}{1:ab }{5:│}|
{5:│}{1:c^d }{5:│}|
{5:│}{2:~ }{5:│}|
{5:└────┘}|
]], float_pos={
[4] = {{id = 1001}, "NW", 1, 1, 1, true, 50};
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
[4] = {win = {id = 1001}, topline = 0, botline = 3, curline = 1, curcol = 1, linecount = 2};
}}
else
screen:expect{grid=[[
|
{0:~}{5:┌────┐}{0: }|
{0:~}{5:│}{1:ab }{5:│}{0: }|
{0:~}{5:│}{1:c^d }{5:│}{0: }|
{0:~}{5:│}{2:~ }{5:│}{0: }|
{0:~}{5:└────┘}{0: }|
:sleep 100 |
]]}
end
feed('<C-C>')
screen:expect_unchanged()

command('setlocal winbar=foo')
feed(':sleep 100')
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[3:----------------------------------------]|
## grid 2
|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
:sleep 100^ |
## grid 4
{5:┌────┐}|
{5:│}{3:foo }{5:│}|
{5:│}{1:ab }{5:│}|
{5:│}{1:cd }{5:│}|
{5:└────┘}|
]], float_pos={
[4] = {{id = 1001}, "NW", 1, 1, 1, true, 50};
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
[4] = {win = {id = 1001}, topline = 0, botline = 2, curline = 1, curcol = 1, linecount = 2};
}}
else
screen:expect{grid=[[
|
{0:~}{5:┌────┐}{0: }|
{0:~}{5:│}{3:foo }{5:│}{0: }|
{0:~}{5:│}{1:ab }{5:│}{0: }|
{0:~}{5:│}{1:cd }{5:│}{0: }|
{0:~}{5:└────┘}{0: }|
:sleep 100^ |
]]}
end

feed('<CR>')
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[3:----------------------------------------]|
## grid 2
|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
:sleep 100 |
## grid 4
{5:┌────┐}|
{5:│}{3:foo }{5:│}|
{5:│}{1:ab }{5:│}|
{5:│}{1:c^d }{5:│}|
{5:└────┘}|
]], float_pos={
[4] = {{id = 1001}, "NW", 1, 1, 1, true, 50};
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
[4] = {win = {id = 1001}, topline = 0, botline = 2, curline = 1, curcol = 1, linecount = 2};
}}
else
screen:expect{grid=[[
|
{0:~}{5:┌────┐}{0: }|
{0:~}{5:│}{3:foo }{5:│}{0: }|
{0:~}{5:│}{1:ab }{5:│}{0: }|
{0:~}{5:│}{1:c^d }{5:│}{0: }|
{0:~}{5:└────┘}{0: }|
:sleep 100 |
]]}
end
feed('<C-C>')
screen:expect_unchanged()
end)
end

describe('with ext_multigrid', function()
Expand Down

0 comments on commit 1c4b3d4

Please sign in to comment.