Mercurial > vim
view src/testdir/test_hlsearch.vim @ 35308:22c03485f222 v9.1.0456
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Commit: https://github.com/vim/vim/commit/88d4f255b7b7a19bb4f6489e0ad0956e47d51fed
Author: Gary Johnson <garyjohn@spocom.com>
Date: Sat Jun 1 20:51:33 2024 +0200
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Problem: Left shift is incorrect with vartabstop and shiftwidth=0
Solution: make tabstop_at() function aware of shift direction
(Gary Johnson)
The problem was that with 'vartabstop' set and 'shiftwidth' equal 0,
left shifts using << were shifting the line to the wrong column. The
tabstop to the right of the first character in the line was being used
as the shift amount instead of the tabstop to the left of that first
character.
The reason was that the tabstop_at() function always returned the value
of the tabstop to the right of the given column and was not accounting
for the direction of the shift.
The solution was to make tabstop_at() aware of the direction of the
shift and to choose the tabtop accordingly.
A test was added to check this behavior and make sure it doesn't
regress.
While at it, also fix a few indentation/alignment issues.
fixes: #14864
closes: #14887
Signed-off-by: Gary Johnson <garyjohn@spocom.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 01 Jun 2024 21:00:03 +0200 |
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