mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19065 from neovim/backport-19064-to-release-0.7

Browse Source 
[Backport release-0.7] vim-patch:8.2.5152: search() gets stuck with "c" and skip evaluates to true
This commit is contained in:
zeertzjq
2022-06-23 20:19:12 +08:00
committed by GitHub
parent a05da1c05a c0224b59da
commit 3942a3f5d0
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/eval/funcs.c
View File

@@ -7760,6 +7760,9 @@ static int search_cmn(typval_T *argvars, pos_T *match_pos, int *flagsp)
break; break;
} }
} }
// clear the start flag to avoid getting stuck here
options &= ~SEARCH_START;
} }
if (subpatnum != FAIL) { if (subpatnum != FAIL) {

12
src/nvim/testdir/test_syntax.vim
View File

@@ -745,8 +745,9 @@ func Test_search_syntax_skip()
1 1
call search('VIM', 'w', '', 0, 'synIDattr(synID(line("."), col("."), 1), "name") =~? "comment"') call search('VIM', 'w', '', 0, 'synIDattr(synID(line("."), col("."), 1), "name") =~? "comment"')
call assert_equal('Another Text for VIM', getline('.')) call assert_equal('Another Text for VIM', getline('.'))
1 1
call search('VIM', 'w', '', 0, 'synIDattr(synID(line("."), col("."), 1), "name") !~? "string"') call search('VIM', 'cw', '', 0, 'synIDattr(synID(line("."), col("."), 1), "name") !~? "string"')
call assert_equal(' let a = "VIM"', getline('.')) call assert_equal(' let a = "VIM"', getline('.'))
" Skip argument using Lambda. " Skip argument using Lambda.
@@ -755,26 +756,27 @@ func Test_search_syntax_skip()
call assert_equal('Another Text for VIM', getline('.')) call assert_equal('Another Text for VIM', getline('.'))
1 1
call search('VIM', 'w', '', 0, { -> synIDattr(synID(line("."), col("."), 1), "name") !~? "string"}) call search('VIM', 'cw', '', 0, { -> synIDattr(synID(line("."), col("."), 1), "name") !~? "string"})
call assert_equal(' let a = "VIM"', getline('.')) call assert_equal(' let a = "VIM"', getline('.'))
" Skip argument using funcref. " Skip argument using funcref.
func InComment() func InComment()
return synIDattr(synID(line("."), col("."), 1), "name") =~? "comment" return synIDattr(synID(line("."), col("."), 1), "name") =~? "comment"
endfunc endfunc
func InString() func NotInString()
return synIDattr(synID(line("."), col("."), 1), "name") !~? "string" return synIDattr(synID(line("."), col("."), 1), "name") !~? "string"
endfunc endfunc
1 1
call search('VIM', 'w', '', 0, function('InComment')) call search('VIM', 'w', '', 0, function('InComment'))
call assert_equal('Another Text for VIM', getline('.')) call assert_equal('Another Text for VIM', getline('.'))
1 1
call search('VIM', 'w', '', 0, function('InString')) call search('VIM', 'cw', '', 0, function('NotInString'))
call assert_equal(' let a = "VIM"', getline('.')) call assert_equal(' let a = "VIM"', getline('.'))
delfunc InComment delfunc InComment
delfunc InString delfunc NotInString
bwipe! bwipe!
endfunc endfunc