Mercurial > vim
view src/testdir/test_jumplist.vim @ 34538:c865c2f93a04 v9.1.0171
patch 9.1.0171: Small split-move related improvements
Commit: https://github.com/vim/vim/commit/5cac1a9bee0798d70a7fd80363a1f697759638e8
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Mar 12 21:11:39 2024 +0100
patch 9.1.0171: Small split-move related improvements
Problem: small improvements can be made to split-move related
functions.
Solution: apply them (Sean Dewar):
- Improve some doc comments (frame_flatten should still work for non-current
tabpages, despite the topframe check, which looks benign, though I'm unsure if
it's still needed; see #2467).
- f_win_splitmove should check_split_disallowed on wp, not targetwin, as that's
what win_splitmove checks (though it's probably unnecessary to check
b_locked_split at all; see #14109, which I hope to get around to finishing at
some point).
- Make winframe_restore restore window positions for the altframe, which
winframe_remove changes. This doesn't affect the prior behaviour, as we called
win_comp_pos after, but as win_comp_pos only works for curtab, and
winframe_remove supports non-current tabpages, we should undo it. Regardless,
this should mean we don't need win_comp_pos anymore; adjust tests to check
that window positions remain unchanged.
I'm not sure win_comp_pos is needed after last_status anyway if it doesn't
steal rows from another frame to make room for a new statusline, which
shouldn't be the case after winframe_remove? To be safe, I'll leave it as is.
closes: #14185
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 12 Mar 2024 21:15:03 +0100 |
parents | 1f3bcb7f3bd0 |
children |
line wrap: on
line source
" Tests for the jumplist functionality " Tests for the getjumplist() function func Test_getjumplist() %bwipe clearjumps call assert_equal([[], 0], getjumplist()) call assert_equal([[], 0], getjumplist(1)) call assert_equal([[], 0], getjumplist(1, 1)) call assert_equal([], getjumplist(100)) call assert_equal([], getjumplist(1, 100)) let lines = [] for i in range(1, 100) call add(lines, "Line " . i) endfor call writefile(lines, "Xtest", 'D') " Jump around and create a jump list edit Xtest let bnr = bufnr('%') normal 50% normal G normal gg let expected = [[ \ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 100, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 3] call assert_equal(expected, getjumplist()) " jumplist doesn't change in between calls call assert_equal(expected, getjumplist()) " Traverse the jump list and verify the results 5 exe "normal \<C-O>" call assert_equal(2, 1->getjumplist()[1]) exe "normal 2\<C-O>" call assert_equal(0, getjumplist(1, 1)[1]) exe "normal 3\<C-I>" call assert_equal(3, getjumplist()[1]) exe "normal \<C-O>" normal 20% let expected = [[ \ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 5, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 100, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 4] call assert_equal(expected, getjumplist()) " jumplist doesn't change in between calls call assert_equal(expected, getjumplist()) let l = getjumplist() call test_garbagecollect_now() call assert_equal(4, l[1]) clearjumps call test_garbagecollect_now() call assert_equal(4, l[1]) endfunc func Test_jumplist_invalid() new clearjumps " put some randome text put ='a' let prev = bufnr('%') setl nomodified bufhidden=wipe e XXJumpListBuffer let bnr = bufnr('%') " 1) empty jumplist let expected = [[ \ {'lnum': 2, 'bufnr': prev, 'col': 0, 'coladd': 0}], 1] call assert_equal(expected, getjumplist()) let jumps = execute(':jumps') call assert_equal('>', jumps[-1:]) " now jump back exe ":norm! \<c-o>" let expected = [[ \ {'lnum': 2, 'bufnr': prev, 'col': 0, 'coladd': 0}, \ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 0] call assert_equal(expected, getjumplist()) let jumps = execute(':jumps') call assert_match('> 0 2 0 -invalid-', jumps) endfunc " Test for '' mark in an empty buffer func Test_empty_buffer() new insert a b c d . call assert_equal(1, line("''")) bwipe! endfunc " Test for 'jumpoptions' func Test_jumpoptions() new call setline(1, range(1, 200)) clearjumps set jumpoptions=stack " Jump around to add some locations to the jump list. normal 10G normal 20G normal 30G normal 40G normal 50G let bnr = bufnr() " discards the tail when navigating from the middle exe "normal \<C-O>\<C-O>" call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 40, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0} \ ], 3], getjumplist()) " new jump location is added immediately after the last one normal 90G call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ ], 4], getjumplist()) " does not add the same location twice adjacently normal 60G normal 60G call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 90, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 60, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ ], 6], getjumplist()) " does add the same location twice non adjacently normal 10G normal 20G call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 90, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 60, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ ], 7], getjumplist()) set jumpoptions& %bw! endfunc " vim: shiftwidth=2 sts=2 expandtab