mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sleep): correct cursor placement (#22639)

Browse Source 
Just setcursor_mayforce(true) is enough as Nvim uses msg_grid.
This commit is contained in:
zeertzjq
2023-03-12 10:40:27 +08:00
committed by GitHub
parent 714f6bf249
commit 1c4b3d41b5
3 changed files with 275 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/ex_docmd.c
View File

@@ -5666,10 +5666,7 @@ static void ex_equal(exarg_T *eap)
static void ex_sleep(exarg_T *eap) static void ex_sleep(exarg_T *eap)
{ {
if (cursor_valid()) { if (cursor_valid()) {
int n = curwin->w_winrow + curwin->w_wrow - msg_scrolled; setcursor_mayforce(true);
if (n >= 0) {
ui_cursor_goto(n, curwin->w_wincol + curwin->w_wcol);
}
} }
long len = eap->line2; long len = eap->line2;

3
src/nvim/move.c
View File

@@ -512,8 +512,7 @@ void approximate_botline_win(win_T *wp)
int cursor_valid(void) int cursor_valid(void)
{ {
check_cursor_moved(curwin); check_cursor_moved(curwin);
return (curwin->w_valid & (VALID_WROW|VALID_WCOL)) == return (curwin->w_valid & (VALID_WROW|VALID_WCOL)) == (VALID_WROW|VALID_WCOL);
(VALID_WROW|VALID_WCOL);
} }
// Validate cursor position. Makes sure w_wrow and w_wcol are valid. // Validate cursor position. Makes sure w_wrow and w_wcol are valid.

274
test/functional/ui/float_spec.lua
View File

@@ -8909,7 +8909,6 @@ describe('float window', function()
]], win_viewport={ ]], win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1}; [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1};
}} }}
else else
screen:expect{grid=[[ screen:expect{grid=[[
^ | ^ |
@@ -8952,6 +8951,279 @@ describe('float window', function()
test_float_move_close('autocmd BufWinLeave * ++once redraw') test_float_move_close('autocmd BufWinLeave * ++once redraw')
end) end)
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 end
describe('with ext_multigrid', function() describe('with ext_multigrid', function()