aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.636

Browse Source 
Problem:    Not all zero-width matches handled correctly for "gn".
Solution:   Move zero-width detection to a separate function. (Christian
            Brabandt)
This commit is contained in:
Bram Moolenaar 2012-08-23 15:53:05 +02:00
parent 4d93dc2699
commit dde0efed85
2 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/search.c
View File

@ -4526,6 +4526,8 @@ current_quote(oap, count, include, quotechar)
#endif /* FEAT_TEXTOBJ */ #endif /* FEAT_TEXTOBJ */
#if defined(FEAT_VISUAL) || defined(PROTO) #if defined(FEAT_VISUAL) || defined(PROTO)
static int is_zerowidth __ARGS((char_u *pattern));
/* /*
* Find next search match under cursor, cursor at end. * Find next search match under cursor, cursor at end.
* Used while an operator is pending, and in Visual mode. * Used while an operator is pending, and in Visual mode.
@ -4546,11 +4548,8 @@ current_search(count, forward)
int visual_active = FALSE; int visual_active = FALSE;
int flags = 0; int flags = 0;
pos_T save_VIsual; pos_T save_VIsual;
regmmatch_T regmatch;
int nmatched = 0;
int zerowidth = FALSE; int zerowidth = FALSE;
/* wrapping should not occur */ /* wrapping should not occur */
p_ws = FALSE; p_ws = FALSE;
@ -4583,24 +4582,11 @@ current_search(count, forward)
else else
orig_pos = pos = start_pos = curwin->w_cursor; orig_pos = pos = start_pos = curwin->w_cursor;
/* /* Is the pattern is zero-width? */
* Check for zero-width pattern. zerowidth = is_zerowidth(spats[last_idx].pat);
*/ if (zerowidth == -1)
if (search_regcomp(spats[last_idx].pat, RE_SEARCH, RE_SEARCH,
((SEARCH_HIS + SEARCH_KEEP)), &regmatch) == FAIL)
return FAIL; return FAIL;
/* Zero-width pattern should match somewhere, then we can check if start
* and end are in the same position. */
nmatched = vim_regexec_multi(&regmatch, curwin, curbuf,
curwin->w_cursor.lnum, (colnr_T)0, NULL);
if (called_emsg)
return FAIL;
if (nmatched && regmatch.startpos[0].lnum == regmatch.endpos[0].lnum
&& regmatch.endpos[0].col == regmatch.startpos[0].col)
zerowidth = TRUE;
vim_free(regmatch.regprog);
/* /*
* The trick is to first search backwards and then search forward again, * The trick is to first search backwards and then search forward again,
* so that a match at the current cursor position will be correctly * so that a match at the current cursor position will be correctly
@ -4693,6 +4679,43 @@ current_search(count, forward)
return OK; return OK;
} }
/*
* Check if the pattern is zero-width.
* Returns TRUE, FALSE or -1 for failure.
*/
static int
is_zerowidth(pattern)
char_u *pattern;
{
regmmatch_T regmatch;
int nmatched = 0;
int result = -1;
pos_T pos;
if (search_regcomp(pattern, RE_SEARCH, RE_SEARCH,
SEARCH_KEEP, &regmatch) == FAIL)
return -1;
/* move to match */
clearpos(&pos);
if (searchit(curwin, curbuf, &pos, FORWARD, spats[last_idx].pat, 1,
SEARCH_KEEP, RE_SEARCH, 0, NULL) != FAIL)
{
/* Zero-width pattern should match somewhere, then we can check if
* start and end are in the same position. */
nmatched = vim_regexec_multi(&regmatch, curwin, curbuf,
pos.lnum, (colnr_T)0, NULL);
if (!called_emsg)
result = (nmatched != 0
&& regmatch.startpos[0].lnum == regmatch.endpos[0].lnum
&& regmatch.startpos[0].col == regmatch.endpos[0].col);
}
vim_free(regmatch.regprog);
return result;
}
#endif /* FEAT_VISUAL */ #endif /* FEAT_VISUAL */
#if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(FEAT_TEXTOBJ) \ #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(FEAT_TEXTOBJ) \

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
636,
/**/ /**/
635, 635,
/**/ /**/