IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13497 from seandewar/vim-8.2.2121

Browse Source 
vim-patch:8.2.{2121,2123}
This commit is contained in:
Jan Edmund Lazo 2020-12-09 19:12:48 -05:00 committed by GitHub
commit 638f5d5b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/popupmnu.c
View File

@ -742,6 +742,7 @@ static int pum_set_selected(int n, int repeat)
// Edit a new, empty buffer. Set options for a "wipeout"
// buffer.
set_option_value("swf", 0L, NULL, OPT_LOCAL);
set_option_value("bl", 0L, NULL, OPT_LOCAL);
set_option_value("bt", 0L, "nofile", OPT_LOCAL);
set_option_value("bh", 0L, "wipe", OPT_LOCAL);
set_option_value("diff", 0L, NULL, OPT_LOCAL);

16
src/nvim/regexp.c
View File

@ -3605,6 +3605,22 @@ theend:
if (backpos.ga_maxlen > BACKPOS_INITIAL)
ga_clear(&backpos);
// Make sure the end is never before the start. Can happen when \zs and
// \ze are used.
if (REG_MULTI) {
const lpos_T *const start = &rex.reg_mmatch->startpos[0];
const lpos_T *const end = &rex.reg_mmatch->endpos[0];
if (end->lnum < start->lnum
|| (end->lnum == start->lnum && end->col < start->col)) {
rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
}
} else {
if (rex.reg_match->endp[0] < rex.reg_match->startp[0]) {
rex.reg_match->endp[0] = rex.reg_match->startp[0];
}
}
return retval;
}

16
src/nvim/regexp_nfa.c
View File

@ -6591,6 +6591,22 @@ static long nfa_regexec_both(char_u *line, colnr_T startcol,
#endif
theend:
// Make sure the end is never before the start. Can happen when \zs and
// \ze are used.
if (REG_MULTI) {
const lpos_T *const start = &rex.reg_mmatch->startpos[0];
const lpos_T *const end = &rex.reg_mmatch->endpos[0];
if (end->lnum < start->lnum
|| (end->lnum == start->lnum && end->col < start->col)) {
rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
}
} else {
if (rex.reg_match->endp[0] < rex.reg_match->startp[0]) {
rex.reg_match->endp[0] = rex.reg_match->startp[0];
}
}
return retval;
}

7
src/nvim/testdir/test_regexp_latin.vim
View File

@ -755,6 +755,13 @@ func Test_start_end_of_buffer_match()
bwipe!
endfunc
func Test_ze_before_zs()
call assert_equal('', matchstr(' ', '\%#=1\ze \zs'))
call assert_equal('', matchstr(' ', '\%#=2\ze \zs'))
call assert_equal(repeat([''], 10), matchlist(' ', '\%#=1\ze \zs'))
call assert_equal(repeat([''], 10), matchlist(' ', '\%#=2\ze \zs'))
endfunc
" Check for detecting error
func Test_regexp_error()
set regexpengine=2