Mercurial > vim
view src/testdir/test_cdo.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 | 5788b78a1af0 |
children |
line wrap: on
line source
" Tests for the :cdo, :cfdo, :ldo and :lfdo commands source check.vim CheckFeature quickfix " Create the files used by the tests func SetUp() call writefile(["Line1", "Line2", "Line3"], 'Xtestfile1') call writefile(["Line1", "Line2", "Line3"], 'Xtestfile2') call writefile(["Line1", "Line2", "Line3"], 'Xtestfile3') endfunc " Remove the files used by the tests func TearDown() call delete('Xtestfile1') call delete('Xtestfile2') call delete('Xtestfile3') endfunc " Returns the current line in '<filename> <linenum>L <column>C' format func GetRuler() return expand('%') . ' ' . line('.') . 'L' . ' ' . col('.') . 'C' endfunc " Tests for the :cdo and :ldo commands func XdoTests(cchar) enew " Shortcuts for calling the cdo and ldo commands let Xdo = a:cchar . 'do' let Xgetexpr = a:cchar . 'getexpr' let Xprev = a:cchar. 'prev' let XdoCmd = Xdo . ' call add(l, GetRuler())' " Try with an empty list let l = [] exe XdoCmd call assert_equal([], l) " Populate the list and then try exe Xgetexpr . " ['non-error 1', 'Xtestfile1:1:3:Line1', 'non-error 2', 'Xtestfile2:2:2:Line2', 'non-error 3', 'Xtestfile3:3:1:Line3']" let l = [] exe XdoCmd call assert_equal(['Xtestfile1 1L 3C', 'Xtestfile2 2L 2C', 'Xtestfile3 3L 1C'], l) " Run command only on selected error lines let l = [] enew exe "2,3" . XdoCmd call assert_equal(['Xtestfile2 2L 2C', 'Xtestfile3 3L 1C'], l) " Boundary condition tests let l = [] enew exe "1,1" . XdoCmd call assert_equal(['Xtestfile1 1L 3C'], l) let l = [] enew exe "3" . XdoCmd call assert_equal(['Xtestfile3 3L 1C'], l) " Range test commands let l = [] enew exe "%" . XdoCmd call assert_equal(['Xtestfile1 1L 3C', 'Xtestfile2 2L 2C', 'Xtestfile3 3L 1C'], l) let l = [] enew exe "1,$" . XdoCmd call assert_equal(['Xtestfile1 1L 3C', 'Xtestfile2 2L 2C', 'Xtestfile3 3L 1C'], l) let l = [] enew exe Xprev exe "." . XdoCmd call assert_equal(['Xtestfile2 2L 2C'], l) let l = [] enew exe "+" . XdoCmd call assert_equal(['Xtestfile3 3L 1C'], l) " Invalid error lines test let l = [] enew exe "silent! 27" . XdoCmd exe "silent! 4,5" . XdoCmd call assert_equal([], l) " Run commands from an unsaved buffer let v:errmsg='' let l = [] enew setlocal modified exe "silent! 2,2" . XdoCmd if v:errmsg !~# 'No write since last change' call add(v:errors, 'Unsaved file change test failed') endif " If the executed command fails, then the operation should be aborted enew! let subst_count = 0 exe "silent!" . Xdo . " s/Line/xLine/ | let subst_count += 1" if subst_count != 1 || getline('.') != 'xLine1' call add(v:errors, 'Abort command on error test failed') endif let l = [] exe "2,2" . Xdo . "! call add(l, GetRuler())" call assert_equal(['Xtestfile2 2L 2C'], l) " List with no valid error entries let l = [] edit! +2 Xtestfile1 exe Xgetexpr . " ['non-error 1', 'non-error 2', 'non-error 3']" exe XdoCmd call assert_equal([], l) exe "silent! 2" . XdoCmd call assert_equal([], l) let v:errmsg='' exe "%" . XdoCmd exe "1,$" . XdoCmd exe "." . XdoCmd call assert_equal('', v:errmsg) " List with only one valid entry let l = [] exe Xgetexpr . " ['Xtestfile3:3:1:Line3']" exe XdoCmd call assert_equal(['Xtestfile3 3L 1C'], l) endfunc " Tests for the :cfdo and :lfdo commands func XfdoTests(cchar) enew " Shortcuts for calling the cfdo and lfdo commands let Xfdo = a:cchar . 'fdo' let Xgetexpr = a:cchar . 'getexpr' let XfdoCmd = Xfdo . ' call add(l, GetRuler())' let Xpfile = a:cchar. 'pfile' " Clear the quickfix/location list exe Xgetexpr . " []" " Try with an empty list let l = [] exe XfdoCmd call assert_equal([], l) " Populate the list and then try exe Xgetexpr . " ['non-error 1', 'Xtestfile1:1:3:Line1', 'Xtestfile1:2:1:Line2', 'non-error 2', 'Xtestfile2:2:2:Line2', 'non-error 3', 'Xtestfile3:2:3:Line2', 'Xtestfile3:3:1:Line3']" let l = [] exe XfdoCmd call assert_equal(['Xtestfile1 1L 3C', 'Xtestfile2 2L 2C', 'Xtestfile3 2L 3C'], l) " Run command only on selected error lines let l = [] exe "2,3" . XfdoCmd call assert_equal(['Xtestfile2 2L 2C', 'Xtestfile3 2L 3C'], l) " Boundary condition tests let l = [] exe "3" . XfdoCmd call assert_equal(['Xtestfile3 2L 3C'], l) " Range test commands let l = [] exe "%" . XfdoCmd call assert_equal(['Xtestfile1 1L 3C', 'Xtestfile2 2L 2C', 'Xtestfile3 2L 3C'], l) let l = [] exe "1,$" . XfdoCmd call assert_equal(['Xtestfile1 1L 3C', 'Xtestfile2 2L 2C', 'Xtestfile3 2L 3C'], l) let l = [] exe Xpfile exe "." . XfdoCmd call assert_equal(['Xtestfile2 2L 2C'], l) " List with only one valid entry let l = [] exe Xgetexpr . " ['Xtestfile2:2:5:Line2']" exe XfdoCmd call assert_equal(['Xtestfile2 2L 5C'], l) endfunc " Tests for cdo and cfdo func Test_cdo() call XdoTests('c') call XfdoTests('c') endfunc " Tests for ldo and lfdo func Test_ldo() call XdoTests('l') call XfdoTests('l') endfunc " Test for making 'shm' doesn't interfere with the output. func Test_cdo_print() enew | only! cgetexpr ["Xtestfile1:1:Line1", "Xtestfile2:1:Line1", "Xtestfile3:1:Line1"] cdo print call assert_equal('Line1', Screenline(&lines)) call assert_equal('Line1', Screenline(&lines - 3)) call assert_equal('Line1', Screenline(&lines - 6)) endfunc " vim: shiftwidth=2 sts=2 expandtab