Mercurial > vim
view src/testdir/test_bufline.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 | 87ff5e71d3c2 |
children |
line wrap: on
line source
" Tests for setbufline(), getbufline(), appendbufline(), deletebufline() source shared.vim source screendump.vim source check.vim func Test_setbufline_getbufline() " similar to Test_set_get_bufline() new let b = bufnr('%') hide call assert_equal(0, setbufline(b, 1, ['foo', 'bar'])) call assert_equal(['foo'], getbufline(b, 1)) call assert_equal('foo', getbufoneline(b, 1)) call assert_equal(['bar'], getbufline(b, '$')) call assert_equal('bar', getbufoneline(b, '$')) call assert_equal(['foo', 'bar'], getbufline(b, 1, 2)) exe "bd!" b call assert_equal([], getbufline(b, 1, 2)) split Xtest call setline(1, ['a', 'b', 'c']) let b = bufnr('%') wincmd w call assert_equal(1, setbufline(b, 5, 'x')) call assert_equal(1, setbufline(b, 5, ['x'])) call assert_equal(0, setbufline(b, 5, [])) call assert_equal(0, setbufline(b, 5, test_null_list())) call assert_equal(1, 'x'->setbufline(bufnr('$') + 1, 1)) call assert_equal(1, ['x']->setbufline(bufnr('$') + 1, 1)) call assert_equal(1, []->setbufline(bufnr('$') + 1, 1)) call assert_equal(1, test_null_list()->setbufline(bufnr('$') + 1, 1)) call assert_equal(['a', 'b', 'c'], getbufline(b, 1, '$')) call assert_equal(0, setbufline(b, 4, ['d', 'e'])) call assert_equal(['c'], b->getbufline(3)) call assert_equal('c', b->getbufoneline(3)) call assert_equal(['d'], getbufline(b, 4)) call assert_equal('d', getbufoneline(b, 4)) call assert_equal(['e'], getbufline(b, 5)) call assert_equal('e', getbufoneline(b, 5)) call assert_equal([], getbufline(b, 6)) call assert_equal([], getbufline(b, 2, 1)) if has('job') call setbufline(b, 2, [function('eval'), #{key: 123}, test_null_job()]) call assert_equal(["function('eval')", \ "{'key': 123}", \ "no process"], \ getbufline(b, 2, 4)) endif exe "bwipe! " . b endfunc func Test_setbufline_getbufline_fold() split Xtest setlocal foldmethod=expr foldexpr=0 let b = bufnr('%') new call assert_equal(0, setbufline(b, 1, ['foo', 'bar'])) call assert_equal(['foo'], getbufline(b, 1)) call assert_equal(['bar'], getbufline(b, 2)) call assert_equal(['foo', 'bar'], getbufline(b, 1, 2)) exe "bwipe!" b bwipe! endfunc func Test_setbufline_getbufline_fold_tab() split Xtest setlocal foldmethod=expr foldexpr=0 let b = bufnr('%') tab new call assert_equal(0, setbufline(b, 1, ['foo', 'bar'])) call assert_equal(['foo'], getbufline(b, 1)) call assert_equal(['bar'], getbufline(b, 2)) call assert_equal(['foo', 'bar'], getbufline(b, 1, 2)) exe "bwipe!" b bwipe! endfunc func Test_setline_startup() let cmd = GetVimCommand('Xscript') if cmd == '' return endif call writefile(['call setline(1, "Hello")', 'silent w Xtest', 'q!'], 'Xscript', 'D') call system(cmd) sleep 50m call assert_equal(['Hello'], readfile('Xtest')) call assert_equal(0, setline(1, [])) call assert_equal(0, setline(1, test_null_list())) call assert_equal(0, setline(5, [])) call assert_equal(0, setline(6, test_null_list())) call delete('Xtest') endfunc func Test_appendbufline() new let b = bufnr('%') hide new call setline(1, ['line1', 'line2', 'line3']) normal! 2gggg call assert_equal(2, line("''")) call assert_equal(0, appendbufline(b, 0, ['foo', 'bar'])) call assert_equal(['foo'], getbufline(b, 1)) call assert_equal(['bar'], getbufline(b, 2)) call assert_equal(['foo', 'bar'], getbufline(b, 1, 2)) call assert_equal(0, appendbufline(b, 0, 'baz')) call assert_equal(['baz', 'foo', 'bar'], getbufline(b, 1, 3)) " appendbufline() in a hidden buffer shouldn't move marks in current window. call assert_equal(2, line("''")) bwipe! exe "bd!" b call assert_equal([], getbufline(b, 1, 3)) split Xtest call setline(1, ['a', 'b', 'c']) let b = bufnr('%') wincmd w call assert_equal(1, appendbufline(b, -1, 'x')) call assert_equal(1, appendbufline(b, -1, ['x'])) call assert_equal(1, appendbufline(b, -1, [])) call assert_equal(1, appendbufline(b, -1, test_null_list())) call assert_equal(1, appendbufline(b, 4, 'x')) call assert_equal(1, appendbufline(b, 4, ['x'])) call assert_equal(0, appendbufline(b, 4, [])) call assert_equal(0, appendbufline(b, 4, test_null_list())) call assert_equal(1, appendbufline(1234, 1, 'x')) call assert_equal(1, appendbufline(1234, 1, ['x'])) call assert_equal(1, appendbufline(1234, 1, [])) call assert_equal(1, appendbufline(1234, 1, test_null_list())) call assert_equal(0, appendbufline(b, 1, [])) call assert_equal(0, appendbufline(b, 1, test_null_list())) call assert_equal(0, appendbufline(b, 3, [])) call assert_equal(0, appendbufline(b, 3, test_null_list())) call assert_equal(['a', 'b', 'c'], getbufline(b, 1, '$')) call assert_equal(0, appendbufline(b, 3, ['d', 'e'])) call assert_equal(['c'], getbufline(b, 3)) call assert_equal(['d'], getbufline(b, 4)) call assert_equal(['e'], getbufline(b, 5)) call assert_equal([], getbufline(b, 6)) exe "bwipe! " . b endfunc func Test_appendbufline_no_E315() let after =<< trim [CODE] set stl=%f ls=2 new let buf = bufnr("%") quit vsp exec "buffer" buf wincmd w call appendbufline(buf, 0, "abc") redraw while getbufline(buf, 1)[0] =~ "^\\s*$" sleep 10m endwhile au VimLeavePre * call writefile([v:errmsg], "Xerror") au VimLeavePre * call writefile(["done"], "Xdone") qall! [CODE] if !RunVim([], after, '--clean') return endif call assert_notmatch("^E315:", readfile("Xerror")[0]) call assert_equal("done", readfile("Xdone")[0]) call delete("Xerror") call delete("Xdone") endfunc func Test_deletebufline() new let b = bufnr('%') call setline(1, ['aaa', 'bbb', 'ccc']) hide new call setline(1, ['line1', 'line2', 'line3']) normal! 2gggg call assert_equal(2, line("''")) call assert_equal(0, deletebufline(b, 2)) call assert_equal(['aaa', 'ccc'], getbufline(b, 1, 2)) call assert_equal(0, deletebufline(b, 2, 8)) call assert_equal(['aaa'], getbufline(b, 1, 2)) " deletebufline() in a hidden buffer shouldn't move marks in current window. call assert_equal(2, line("''")) bwipe! exe "bd!" b call assert_equal(1, b->deletebufline(1)) call assert_equal(1, deletebufline(-1, 1)) split Xtest call setline(1, ['a', 'b', 'c']) call cursor(line('$'), 1) let b = bufnr('%') wincmd w call assert_equal(1, deletebufline(b, 4)) call assert_equal(0, deletebufline(b, 1)) call assert_equal(['b', 'c'], getbufline(b, 1, 2)) exe "bwipe! " . b edit XbufOne let one = bufnr() call setline(1, ['a', 'b', 'c']) setlocal nomodifiable split XbufTwo let two = bufnr() call assert_fails('call deletebufline(one, 1)', 'E21:') call assert_equal(two, bufnr()) bwipe! XbufTwo bwipe! XbufOne endfunc func Test_appendbufline_redraw() CheckScreendump let lines =<< trim END new foo let winnr = 'foo'->bufwinnr() let buf = bufnr('foo') wincmd p call appendbufline(buf, '$', range(1,200)) exe winnr .. 'wincmd w' norm! G wincmd p call deletebufline(buf, 1, '$') call appendbufline(buf, '$', 'Hello Vim world...') END call writefile(lines, 'XscriptMatchCommon', 'D') let buf = RunVimInTerminal('-S XscriptMatchCommon', #{rows: 10}) call VerifyScreenDump(buf, 'Test_appendbufline_1', {}) call StopVimInTerminal(buf) endfunc func Test_setbufline_select_mode() new call setline(1, ['foo', 'bar']) call feedkeys("j^v2l\<C-G>", 'nx') let bufnr = bufadd('Xdummy') call bufload(bufnr) call setbufline(bufnr, 1, ['abc']) call feedkeys("x", 'nx') call assert_equal(['foo', 'x'], getline(1, 2)) exe "bwipe! " .. bufnr bwipe! endfunc func Test_deletebufline_select_mode() new call setline(1, ['foo', 'bar']) call feedkeys("j^v2l\<C-G>", 'nx') let bufnr = bufadd('Xdummy') call bufload(bufnr) call setbufline(bufnr, 1, ['abc', 'def']) call deletebufline(bufnr, 1) call feedkeys("x", 'nx') call assert_equal(['foo', 'x'], getline(1, 2)) exe "bwipe! " .. bufnr bwipe! endfunc func Test_deletebufline_popup_window() let popupID = popup_create('foo', {}) let bufnr = winbufnr(popupID) " Check that deletebufline() brings us back to the same window. new let winid_before = win_getid() call deletebufline(bufnr, 1, '$') call assert_equal(winid_before, win_getid()) bwipe call popup_close(popupID) endfunc func Test_setbufline_startup_nofile() let before =<< trim [CODE] set shortmess+=F file Xresult set buftype=nofile call setbufline('', 1, 'success') [CODE] let after =<< trim [CODE] set buftype= write quit [CODE] if !RunVim(before, after, '--clean') return endif call assert_equal(['success'], readfile('Xresult')) call delete('Xresult') endfunc " Test that setbufline(), appendbufline() and deletebufline() should fail and " return 1 when "textlock" is active. func Test_change_bufline_with_textlock() new inoremap <buffer> <expr> <F2> setbufline('', 1, '') call assert_fails("normal a\<F2>", 'E565:') call assert_equal('1', getline(1)) inoremap <buffer> <expr> <F2> appendbufline('', 1, '') call assert_fails("normal a\<F2>", 'E565:') call assert_equal('11', getline(1)) inoremap <buffer> <expr> <F2> deletebufline('', 1) call assert_fails("normal a\<F2>", 'E565:') call assert_equal('111', getline(1)) bwipe! endfunc " vim: shiftwidth=2 sts=2 expandtab