Mercurial > vim
view src/testdir/test_blockedit.vim @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 28 Mar 2024 12:15:03 +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