aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00
Code Activity

patch 8.2.3265: smartcase does not work correctly in very magic pattern

Browse Source 
Problem:    Smartcase does not work correctly in very magic pattern.
Solution:   Take the magicness into account when skipping over regexp items.
            (Christian Brabandt, closes #8682, closes #7845)
This commit is contained in:
Christian Brabandt
2021-08-01 12:44:37 +02:00
committed by Bram Moolenaar
parent f24f51d030
commit 78ba933d18
3 changed files with 66 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/search.c
View File

@@ -430,6 +430,10 @@ ignorecase_opt(char_u *pat, int ic_in, int scs)
pat_has_uppercase(char_u *pat)
{
char_u *p = pat;
magic_T magic_val = MAGIC_ON;
// get the magicness of the pattern
(void)skip_regexp_ex(pat, NUL, magic_isset(), NULL, NULL, &magic_val);
while (*p != NUL)
{
@@ -441,7 +445,7 @@ pat_has_uppercase(char_u *pat)
return TRUE;
p += l;
}
else if (*p == '\\')
else if (*p == '\\' && magic_val == MAGIC_ON)
{
if (p[1] == '_' && p[2] != NUL) // skip "\_X"
p += 3;
@@ -452,6 +456,11 @@ pat_has_uppercase(char_u *pat)
else
p += 1;
}
else if ((*p == '%' || *p == '_') && magic_val == MAGIC_ALL)
{
if (p[1] != NUL) // skip "_X" and %X
p += 2;
}
else if (MB_ISUPPER(*p))
return TRUE;
else

54
src/testdir/test_search.vim
View File

@@ -1912,4 +1912,58 @@ func Test_incsearch_substitute_dump2()
call delete('Xis_subst_script2')
endfunc
func Test_pattern_is_uppercase_smartcase()
new
let input=['abc', 'ABC', 'Abc', 'abC']
call setline(1, input)
call cursor(1,1)
" default, matches firstline
%s/abc//g
call assert_equal(['', 'ABC', 'Abc', 'abC'],
\ getline(1, '$'))
set smartcase ignorecase
sil %d
call setline(1, input)
call cursor(1,1)
" with smartcase and incsearch set, matches everything
%s/abc//g
call assert_equal(['', '', '', ''], getline(1, '$'))
sil %d
call setline(1, input)
call cursor(1,1)
" with smartcase and incsearch set and found an uppercase letter,
" match only that.
%s/abC//g
call assert_equal(['abc', 'ABC', 'Abc', ''],
\ getline(1, '$'))
sil %d
call setline(1, input)
call cursor(1,1)
exe "norm! vG$\<esc>"
" \%V should not be detected as uppercase letter
%s/\%Vabc//g
call assert_equal(['', '', '', ''], getline(1, '$'))
call setline(1, input)
call cursor(1,1)
exe "norm! vG$\<esc>"
" \v%V should not be detected as uppercase letter
%s/\v%Vabc//g
call assert_equal(['', '', '', ''], getline(1, '$'))
call setline(1, input)
call cursor(1,1)
exe "norm! vG$\<esc>"
" \v%VabC should be detected as uppercase letter
%s/\v%VabC//g
call assert_equal(['abc', 'ABC', 'Abc', ''],
\ getline(1, '$'))
set smartcase& ignorecase&
bw!
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

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