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

vim-patch:9.0.1772: Cursor may be adjusted in 'splitkeep'ed windows

Browse Source 
Problem:    Cursor is adjusted in window that did not change in size by
            'splitkeep'.
Solution:   Only check that cursor position is valid in a window that
            has changed in size.

closes: vim/vim#12509

16af913eee

Co-authored-by: Luuk van Baal <luukvbaal@gmail.com>
This commit is contained in:
zeertzjq
2023-08-21 08:58:18 +08:00
parent 6809d3377c
commit 749ff7a342
4 changed files with 96 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
test/functional/legacy/window_cmd_spec.lua
View File

@@ -43,6 +43,61 @@ describe('splitkeep', function()
screen:attach()
end)
-- oldtest: Test_splitkeep_cursor()
it('does not adjust cursor in window that did not change size', function()
screen:try_resize(75, 8)
-- FIXME: bottom window is different without the "vsplit | close"
exec([[
vsplit | close
set scrolloff=5
set splitkeep=screen
autocmd CursorMoved * wincmd p | wincmd p
call setline(1, range(1, 200))
func CursorEqualize()
call cursor(100, 1)
wincmd =
endfunc
wincmd s
call CursorEqualize()
]])
screen:expect([[
99 |
^100 |
101 |
[No Name] [+] |
5 |
6 |
[No Name] [+] |
|
]])
feed('j')
screen:expect([[
100 |
^101 |
102 |
[No Name] [+] |
5 |
6 |
[No Name] [+] |
|
]])
command('set scrolloff=0')
feed('G')
screen:expect([[
198 |
199 |
^200 |
[No Name] [+] |
5 |
6 |
[No Name] [+] |
|
]])
end)
-- oldtest: Test_splitkeep_callback()
it('does not scroll when split in callback', function()
exec([[

29
test/old/testdir/test_window_cmd.vim
View File

@@ -1807,7 +1807,34 @@ function Test_splitkeep_misc()
set splitkeep&
endfunc
function Test_splitkeep_callback()
func Test_splitkeep_cursor()
CheckScreendump
let lines =<< trim END
set splitkeep=screen
autocmd CursorMoved * wincmd p | wincmd p
call setline(1, range(1, 200))
func CursorEqualize()
call cursor(100, 1)
wincmd =
endfunc
wincmd s
call CursorEqualize()
END
call writefile(lines, 'XTestSplitkeepCallback', 'D')
let buf = RunVimInTerminal('-S XTestSplitkeepCallback', #{rows: 8})
call VerifyScreenDump(buf, 'Test_splitkeep_cursor_1', {})
call term_sendkeys(buf, "j")
call VerifyScreenDump(buf, 'Test_splitkeep_cursor_2', {})
call term_sendkeys(buf, ":set scrolloff=0\<CR>G")
call VerifyScreenDump(buf, 'Test_splitkeep_cursor_3', {})
call StopVimInTerminal(buf)
endfunc
func Test_splitkeep_callback()
CheckScreendump
let lines =<< trim END
set splitkeep=screen