Mercurial > vim
view src/testdir/test_checkpath.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 | f7a2de8a4ddc |
children |
line wrap: on
line source
" Tests for the :checkpath command " Test for 'include' without \zs or \ze func Test_checkpath1() call mkdir("Xcheckdir1/dir2", "pR") call writefile(['#include "bar.a"'], 'Xcheckdir1/dir2/foo.a') call writefile(['#include "baz.a"'], 'Xcheckdir1/dir2/bar.a') call writefile(['#include "foo.a"'], 'Xcheckdir1/dir2/baz.a') call writefile(['#include <foo.a>'], 'Xbase.a') edit Xbase.a set path=Xcheckdir1/dir2 let res = split(execute("checkpath!"), "\n") call assert_equal([ \ '--- Included files in path ---', \ 'Xcheckdir1/dir2/foo.a', \ 'Xcheckdir1/dir2/foo.a -->', \ ' Xcheckdir1/dir2/bar.a', \ ' Xcheckdir1/dir2/bar.a -->', \ ' Xcheckdir1/dir2/baz.a', \ ' Xcheckdir1/dir2/baz.a -->', \ ' "foo.a" (Already listed)'], res) enew call delete("./Xbase.a") set path& endfunc func DotsToSlashes() return substitute(v:fname, '\.', '/', 'g') . '.b' endfunc " Test for 'include' with \zs and \ze func Test_checkpath2() call mkdir("Xcheckdir2/dir2", "pR") call writefile(['%inc /bar/'], 'Xcheckdir2/dir2/foo.b') call writefile(['%inc /baz/'], 'Xcheckdir2/dir2/bar.b') call writefile(['%inc /foo/'], 'Xcheckdir2/dir2/baz.b') call writefile(['%inc /foo/'], 'Xbase.b', 'D') let &include='^\s*%inc\s*/\zs[^/]\+\ze' let &includeexpr='DotsToSlashes()' edit Xbase.b set path=Xcheckdir2/dir2 let res = split(execute("checkpath!"), "\n") call assert_equal([ \ '--- Included files in path ---', \ 'Xcheckdir2/dir2/foo.b', \ 'Xcheckdir2/dir2/foo.b -->', \ ' Xcheckdir2/dir2/bar.b', \ ' Xcheckdir2/dir2/bar.b -->', \ ' Xcheckdir2/dir2/baz.b', \ ' Xcheckdir2/dir2/baz.b -->', \ ' foo (Already listed)'], res) enew set path& set include& set includeexpr& endfunc func StripNewlineChar() if v:fname =~ '\n$' return v:fname[:-2] endif return v:fname endfunc " Test for 'include' with \zs and no \ze func Test_checkpath3() call mkdir("Xcheckdir3/dir2", "pR") call writefile(['%inc bar.c'], 'Xcheckdir3/dir2/foo.c') call writefile(['%inc baz.c'], 'Xcheckdir3/dir2/bar.c') call writefile(['%inc foo.c'], 'Xcheckdir3/dir2/baz.c') call writefile(['%inc foo.c'], 'Xcheckdir3/dir2/FALSE.c') call writefile(['%inc FALSE.c foo.c'], 'Xbase.c', 'D') let &include='^\s*%inc\s*\%([[:upper:]][^[:space:]]*\s\+\)\?\zs\S\+\ze' let &includeexpr='StripNewlineChar()' edit Xbase.c set path=Xcheckdir3/dir2 let res = split(execute("checkpath!"), "\n") call assert_equal([ \ '--- Included files in path ---', \ 'Xcheckdir3/dir2/foo.c', \ 'Xcheckdir3/dir2/foo.c -->', \ ' Xcheckdir3/dir2/bar.c', \ ' Xcheckdir3/dir2/bar.c -->', \ ' Xcheckdir3/dir2/baz.c', \ ' Xcheckdir3/dir2/baz.c -->', \ ' foo.c (Already listed)'], res) enew set path& set include& set includeexpr& endfunc " Test for invalid regex in 'include' and 'define' options func Test_checkpath_errors() let save_include = &include set include=\\%( call assert_fails('checkpath', 'E53:') let &include = save_include let save_define = &define set define=\\%( call assert_fails('dsearch abc', 'E53:') let &define = save_define call assert_fails('psearch \%(', 'E53:') endfunc " vim: shiftwidth=2 sts=2 expandtab