Mercurial > vim
view src/testdir/test_jumplist.vim @ 34379:37b4c89ba420 v9.1.0116
patch 9.1.0116: win_split_ins may not check available room
Commit: https://github.com/vim/vim/commit/0fd44a5ad81ade342cb54d8984965bdedd2272c8
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Feb 20 20:28:15 2024 +0100
patch 9.1.0116: win_split_ins may not check available room
Problem: win_split_ins has no check for E36 when moving an existing
window
Solution: check for room and fix the issues in f_win_splitmove()
(Sean Dewar)
win_split_ins has no check for E36 when moving an existing window,
allowing for layouts with many overlapping zero-sized windows to be
created (which may also cause drawing issues with tablines and such).
f_win_splitmove also has some bugs.
So check for room and fix the issues in f_win_splitmove. Handle failure
in the two relevant win_split_ins callers by restoring the original
layout, and factor the common logic into win_splitmove.
Don't check for room when opening an autocommand window, as it's a
temporary window that's rarely interacted with or drawn anyhow, and is
rather important for some autocommands.
Issues fixed in f_win_splitmove:
- Error if splitting is disallowed.
- Fix heap-use-after-frees if autocommands fired from switching to "targetwin"
close "wp" or "oldwin".
- Fix splitting the wrong window if autocommands fired from switching to
"targetwin" switch to a different window.
- Ensure -1 is returned for all errors.
Also handle allocation failure a bit earlier in make_snapshot (callers,
except win_splitmove, don't really care if a snapshot can't be made, so
just ignore the return value).
Note: Test_smoothscroll_in_zero_width_window failed after these changes with
E36, as it was using the previous behaviour to create a zero-width window.
I've fixed the test such that it fails with UBSAN as expected when v9.0.1367 is
reverted (and simplified it too).
related: #14042
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, 20 Feb 2024 22:30:04 +0100 |
parents | 1f3bcb7f3bd0 |
children | 814fcbca4d8d |
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