mirror of
https://github.com/neovim/neovim.git
synced 2025-10-16 23:06:14 +00:00
vim-patch:8.2.3265: smartcase does not work correctly in very magic pattern
Problem: Smartcase does not work correctly in very magic pattern.
Solution: Take the magicness into account when skipping over regexp items.
(Christian Brabandt, closes vim/vim#8682, closes vim/vim#7845)
78ba933d18
Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@@ -373,6 +373,10 @@ bool pat_has_uppercase(char_u *pat)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
char_u *p = pat;
|
||||
magic_T magic_val = MAGIC_ON;
|
||||
|
||||
// get the magicness of the pattern
|
||||
(void)skip_regexp_ex((char *)pat, NUL, magic_isset(), NULL, NULL, &magic_val);
|
||||
|
||||
while (*p != NUL) {
|
||||
const int l = utfc_ptr2len((char *)p);
|
||||
@@ -382,7 +386,7 @@ bool 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;
|
||||
} else if (p[1] == '%' && p[2] != NUL) { // skip "\%X"
|
||||
@@ -392,6 +396,10 @@ bool 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 {
|
||||
|
Reference in New Issue
Block a user