Mercurial > vim
view src/testdir/test_hlsearch.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 | 695b50472e85 |
children |
line wrap: on
line source
" Test for v:hlsearch source check.vim source screendump.vim func Test_hlsearch() new call setline(1, repeat(['aaa'], 10)) set hlsearch nolazyredraw " redraw is needed to make hlsearch highlight the matches exe "normal! /aaa\<CR>" | redraw let r1 = screenattr(1, 1) nohlsearch | redraw call assert_notequal(r1, screenattr(1,1)) let v:hlsearch=1 | redraw call assert_equal(r1, screenattr(1,1)) let v:hlsearch=0 | redraw call assert_notequal(r1, screenattr(1,1)) set hlsearch | redraw call assert_equal(r1, screenattr(1,1)) let v:hlsearch=0 | redraw call assert_notequal(r1, screenattr(1,1)) exe "normal! n" | redraw call assert_equal(r1, screenattr(1,1)) let v:hlsearch=0 | redraw call assert_notequal(r1, screenattr(1,1)) exe "normal! /\<CR>" | redraw call assert_equal(r1, screenattr(1,1)) set nohls exe "normal! /\<CR>" | redraw call assert_notequal(r1, screenattr(1,1)) call assert_fails('let v:hlsearch=[]', 'E745:') call garbagecollect(1) call getchar(1) enew! endfunc func Test_hlsearch_hangs() CheckFunction reltimefloat " So, it turns out that Windows 7 implements TimerQueue timers differently " and they can expire *before* the requested time has elapsed. So allow for " the timeout occurring after 80 ms (5 * 16 (the typical clock tick)). if has("win32") let min_timeout = 0.08 else let min_timeout = 0.1 endif " This pattern takes a long time to match, it should timeout. new call setline(1, ['aaa', repeat('abc ', 1000), 'ccc']) let start = reltime() set hlsearch nolazyredraw redrawtime=101 let @/ = '\%#=1a*.*X\@<=b*' redraw let elapsed = reltimefloat(reltime(start)) call assert_inrange(min_timeout, 1.0, elapsed) set nohlsearch redrawtime& bwipe! endfunc func Test_hlsearch_eol_highlight() new call append(1, repeat([''], 9)) set hlsearch nolazyredraw exe "normal! /$\<CR>" | redraw let attr = screenattr(1, 1) for row in range(2, 10) call assert_equal(attr, screenattr(row, 1), 'in line ' . row) endfor set nohlsearch bwipe! endfunc func Test_hlsearch_Ctrl_R() CheckRunVimInTerminal let lines =<< trim END set incsearch hlsearch let @" = "text" put END call writefile(lines, 'XhlsearchCtrlR', 'D') let buf = RunVimInTerminal('-S XhlsearchCtrlR', #{rows: 6, cols: 60}) call term_sendkeys(buf, "/\<C-R>\<C-R>\"") call VerifyScreenDump(buf, 'Test_hlsearch_ctrlr_1', {}) call term_sendkeys(buf, "\<Esc>") call StopVimInTerminal(buf) endfunc func Test_hlsearch_clipboard() CheckRunVimInTerminal CheckFeature clipboard_working let lines =<< trim END set incsearch hlsearch let @* = "text" put * END call writefile(lines, 'XhlsearchClipboard', 'D') let buf = RunVimInTerminal('-S XhlsearchClipboard', #{rows: 6, cols: 60}) call term_sendkeys(buf, "/\<C-R>*") call VerifyScreenDump(buf, 'Test_hlsearch_ctrlr_1', {}) call term_sendkeys(buf, "\<Esc>") call StopVimInTerminal(buf) endfunc " vim: shiftwidth=2 sts=2 expandtab