Mercurial > vim
view src/testdir/test_blockedit.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 | dbec60b8c253 |
children |
line wrap: on
line source
" Test for block inserting func Test_blockinsert_indent() new filetype plugin indent on setlocal sw=2 et ft=vim call setline(1, ['let a=[', ' ''eins'',', ' ''zwei'',', ' ''drei'']']) call cursor(2, 3) exe "norm! \<c-v>2jI\\ \<esc>" call assert_equal(['let a=[', ' \ ''eins'',', ' \ ''zwei'',', ' \ ''drei'']'], \ getline(1,'$')) " reset to sane state filetype off bwipe! endfunc func Test_blockinsert_autoindent() new let lines =<< trim END vim9script var d = { a: () => 0, b: () => 0, c: () => 0, } END call setline(1, lines) filetype plugin indent on setlocal sw=2 et ft=vim setlocal indentkeys+=: exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>" let expected =<< trim END vim9script var d = { a: (): asdf => 0, b: (): asdf => 0, c: (): asdf => 0, } END call assert_equal(expected, getline(1, 6)) " insert on the next column should do exactly the same :%dele call setline(1, lines) exe "norm! 3Gf)l\<c-v>2jI: asdf\<esc>" call assert_equal(expected, getline(1, 6)) :%dele call setline(1, lines) setlocal sw=8 noet exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>" let expected =<< trim END vim9script var d = { a: (): asdf => 0, b: (): asdf => 0, c: (): asdf => 0, } END call assert_equal(expected, getline(1, 6)) " insert on the next column should do exactly the same :%dele call setline(1, lines) exe "norm! 3Gf)l\<c-v>2jI: asdf\<esc>" call assert_equal(expected, getline(1, 6)) filetype off bwipe! endfunc func Test_blockinsert_delete() new let _bs = &bs set bs=2 call setline(1, ['case Arg is ', ' when Name_Async,', ' when Name_Num_Gangs,', 'end if;']) exe "norm! ggjVj\<c-v>$o$A\<bs>\<esc>" "call feedkeys("Vj\<c-v>$o$A\<bs>\<esc>", 'ti') call assert_equal(["case Arg is ", " when Name_Async", " when Name_Num_Gangs,", "end if;"], \ getline(1,'$')) " reset to sane state let &bs = _bs bwipe! endfunc func Test_blockappend_eol_cursor() new " Test 1 Move 1 char left call setline(1, ['aaa', 'bbb', 'ccc']) exe "norm! gg$\<c-v>2jA\<left>x\<esc>" call assert_equal(['aaxa', 'bbxb', 'ccxc'], getline(1, '$')) " Test 2 Move 2 chars left sil %d call setline(1, ['aaa', 'bbb', 'ccc']) exe "norm! gg$\<c-v>2jA\<left>\<left>x\<esc>" call assert_equal(['axaa', 'bxbb', 'cxcc'], getline(1, '$')) " Test 3 Move 3 chars left (outside of the visual selection) sil %d call setline(1, ['aaa', 'bbb', 'ccc']) exe "norm! ggl$\<c-v>2jA\<left>\<left>\<left>x\<esc>" call assert_equal(['xaaa', 'bbb', 'ccc'], getline(1, '$')) bw! endfunc func Test_blockappend_eol_cursor2() new " Test 1 Move 1 char left call setline(1, ['aaaaa', 'bbb', 'ccccc']) exe "norm! gg\<c-v>$2jA\<left>x\<esc>" call assert_equal(['aaaaxa', 'bbbx', 'ccccxc'], getline(1, '$')) " Test 2 Move 2 chars left sil %d call setline(1, ['aaaaa', 'bbb', 'ccccc']) exe "norm! gg\<c-v>$2jA\<left>\<left>x\<esc>" call assert_equal(['aaaxaa', 'bbbx', 'cccxcc'], getline(1, '$')) " Test 3 Move 3 chars left (to the beginning of the visual selection) sil %d call setline(1, ['aaaaa', 'bbb', 'ccccc']) exe "norm! gg\<c-v>$2jA\<left>\<left>\<left>x\<esc>" call assert_equal(['aaxaaa', 'bbxb', 'ccxccc'], getline(1, '$')) " Test 4 Move 3 chars left (outside of the visual selection) sil %d call setline(1, ['aaaaa', 'bbb', 'ccccc']) exe "norm! ggl\<c-v>$2jA\<left>\<left>\<left>x\<esc>" call assert_equal(['aaxaaa', 'bbxb', 'ccxccc'], getline(1, '$')) " Test 5 Move 4 chars left (outside of the visual selection) sil %d call setline(1, ['aaaaa', 'bbb', 'ccccc']) exe "norm! ggl\<c-v>$2jA\<left>\<left>\<left>\<left>x\<esc>" call assert_equal(['axaaaa', 'bxbb', 'cxcccc'], getline(1, '$')) bw! endfunc " vim: shiftwidth=2 sts=2 expandtab