mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 19:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0623: error for invalid regexp is not very informative

Browse Source 
Problem:    The message "Invalid range" is used for multiple errors.
Solution:   Add two more specific error messages. (Itchyny, Ken Hamada)
966e58e413
This commit is contained in:
Jan Edmund Lazo
2018-06-04 08:40:54 -04:00
parent fe5c891fe0
commit 21aa4bc428
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/regexp.c
View File

@@ -479,6 +479,8 @@ static char_u *regprop(char_u *);
#endif #endif
static char_u e_missingbracket[] = N_("E769: Missing ] after %s["); static char_u e_missingbracket[] = N_("E769: Missing ] after %s[");
static char_u e_reverse_range[] = N_("E944: Reverse range in character class");
static char_u e_large_class[] = N_("E945: Range too large in character class");
static char_u e_unmatchedpp[] = N_("E53: Unmatched %s%%("); static char_u e_unmatchedpp[] = N_("E53: Unmatched %s%%(");
static char_u e_unmatchedp[] = N_("E54: Unmatched %s("); static char_u e_unmatchedp[] = N_("E54: Unmatched %s(");
static char_u e_unmatchedpar[] = N_("E55: Unmatched %s)"); static char_u e_unmatchedpar[] = N_("E55: Unmatched %s)");
@@ -2233,12 +2235,12 @@ collection:
endc = coll_get_char(); endc = coll_get_char();
if (startc > endc) if (startc > endc)
EMSG_RET_NULL(_(e_invrange)); EMSG_RET_NULL(_(e_reverse_range));
if (has_mbyte && ((*mb_char2len)(startc) > 1 if (has_mbyte && ((*mb_char2len)(startc) > 1
|| (*mb_char2len)(endc) > 1)) { || (*mb_char2len)(endc) > 1)) {
/* Limit to a range of 256 chars */ /* Limit to a range of 256 chars */
if (endc > startc + 256) if (endc > startc + 256)
EMSG_RET_NULL(_(e_invrange)); EMSG_RET_NULL(_(e_large_class));
while (++startc <= endc) while (++startc <= endc)
regmbc(startc); regmbc(startc);
} else { } else {

2
src/nvim/regexp_nfa.c
View File

@@ -1712,7 +1712,7 @@ collection:
endc = startc; endc = startc;
startc = oldstartc; startc = oldstartc;
if (startc > endc) if (startc > endc)
EMSG_RET_FAIL(_(e_invrange)); EMSG_RET_FAIL(_(e_reverse_range));
if (endc > startc + 2) { if (endc > startc + 2) {
/* Emit a range instead of the sequence of /* Emit a range instead of the sequence of

17
src/nvim/testdir/test_regexp_utf8.vim
View File

@@ -166,3 +166,20 @@ func Test_eow_with_optional()
call assert_equal(expected, actual) call assert_equal(expected, actual)
endfor endfor
endfunc endfunc
func Test_reversed_range()
for re in range(0, 2)
exe 'set re=' . re
call assert_fails('call match("abc def", "[c-a]")', 'E944:')
endfor
set re=0
endfunc
func Test_large_class()
set re=1
call assert_fails('call match("abc def", "[\u3000-\u4000]")', 'E945:')
set re=2
call assert_equal(0, 'abc def' =~# '[\u3000-\u4000]')
call assert_equal(1, "\u3042" =~# '[\u3000-\u4000]')
set re=0
endfunc