forked from aniani/vim
patch 9.1.0217: regexp: verymagic cannot match before/after a mark
Problem: regexp: verymagic cannot match before/after a mark Solution: Correctly check for the very magic check (Julio B) Fix regexp parser for \v%>'m and \v%<'m Currently \v%'m works fine, but it is unable to match before or after the position of mark m. closes: #14309 Signed-off-by: Julio B <julio.bacel@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
74a2331846
commit
46fa3c7e27
@@ -1641,7 +1641,7 @@ regatom(int *flagp)
|
|||||||
n = n * 10 + (c - '0');
|
n = n * 10 + (c - '0');
|
||||||
c = getchr();
|
c = getchr();
|
||||||
}
|
}
|
||||||
if (c == '\'' && n == 0)
|
if (no_Magic(c) == '\'' && n == 0)
|
||||||
{
|
{
|
||||||
// "\%'m", "\%<'m" and "\%>'m": Mark
|
// "\%'m", "\%<'m" and "\%>'m": Mark
|
||||||
c = getchr();
|
c = getchr();
|
||||||
|
|||||||
@@ -1733,7 +1733,7 @@ nfa_regatom(void)
|
|||||||
EMIT((int)n);
|
EMIT((int)n);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (c == '\'' && n == 0)
|
else if (no_Magic(c) == '\'' && n == 0)
|
||||||
{
|
{
|
||||||
// \%'m \%<'m \%>'m
|
// \%'m \%<'m \%>'m
|
||||||
EMIT(cmp == '<' ? NFA_MARK_LT :
|
EMIT(cmp == '<' ? NFA_MARK_LT :
|
||||||
|
|||||||
@@ -874,12 +874,26 @@ func Regex_Mark()
|
|||||||
%d
|
%d
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
" Same test as abobe, but use verymagic
|
||||||
|
func Regex_Mark_Verymagic()
|
||||||
|
call append(0, ['', '', '', 'Marks:', 'asdfSasdfsadfEasdf', 'asdfSas',
|
||||||
|
\ 'dfsadfEasdf', '', '', '', '', ''])
|
||||||
|
call cursor(4, 1)
|
||||||
|
exe "normal jfSmsfEme:.-4,.+6s/\\v.%>'s.*%<'e../here/\<CR>"
|
||||||
|
exe "normal jfSmsj0fEme:.-4,.+6s/\\v.%>'s\\_.*%<'e../again/\<CR>"
|
||||||
|
call assert_equal(['', '', '', 'Marks:', 'asdfhereasdf', 'asdfagainasdf',
|
||||||
|
\ '', '', '', '', '', ''], getline(1, '$'))
|
||||||
|
%d
|
||||||
|
endfunc
|
||||||
|
|
||||||
func Test_matching_marks()
|
func Test_matching_marks()
|
||||||
new
|
new
|
||||||
set regexpengine=1
|
set regexpengine=1
|
||||||
call Regex_Mark()
|
call Regex_Mark()
|
||||||
|
call Regex_Mark_Verymagic()
|
||||||
set regexpengine=2
|
set regexpengine=2
|
||||||
call Regex_Mark()
|
call Regex_Mark()
|
||||||
|
call Regex_Mark_Verymagic()
|
||||||
bwipe!
|
bwipe!
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user