mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-21 06:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1325: tests: not checking error numbers properly

Browse Source 
Problem:  tests: not checking error numbers properly.
Solution: Add a trailing comma to avoid matching a different error
          number with the same prefix (zeertzjq)

closes: vim/vim#17159

67fe77d272
This commit is contained in:
zeertzjq
2026-01-19 10:32:55 +08:00
parent 0d3ed7904a
commit da20804a6a
9 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/old/testdir/test_arglist.vim
View File

@@ -640,7 +640,7 @@ endfunc
func Test_clear_arglist_in_all() func Test_clear_arglist_in_all()
n 0 00 000 0000 00000 000000 n 0 00 000 0000 00000 000000
au WinNew 0 n 0 au WinNew 0 n 0
call assert_fails("all", "E1156") call assert_fails("all", "E1156:")
au! * au! *
endfunc endfunc

26
test/old/testdir/test_autocmd.vim
View File

@@ -3817,10 +3817,10 @@ func Test_autocmd_normal_mess()
au BufLeave,BufWinLeave,BufHidden,BufUnload,BufDelete,BufWipeout * norm 7q/qc au BufLeave,BufWinLeave,BufHidden,BufUnload,BufDelete,BufWipeout * norm 7q/qc
augroup END augroup END
" Nvim has removed :open " Nvim has removed :open
" call assert_fails('o4', 'E1159') " call assert_fails('o4', 'E1159:')
call assert_fails('e4', 'E1159') call assert_fails('e4', 'E1159:')
silent! H silent! H
call assert_fails('e xx', 'E1159') call assert_fails('e xx', 'E1159:')
normal G normal G
augroup aucmd_normal_test augroup aucmd_normal_test
@@ -4729,32 +4729,32 @@ func Test_autocmd_tabclosedpre()
" Close tab in TabClosedPre autocmd " Close tab in TabClosedPre autocmd
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
au TabClosedPre * tabclose au TabClosedPre * tabclose
call assert_fails('tabclose', 'E1312') call assert_fails('tabclose', 'E1312:')
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
au TabClosedPre * tabclose au TabClosedPre * tabclose
call assert_fails('tabclose 2', 'E1312') call assert_fails('tabclose 2', 'E1312:')
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
au TabClosedPre * tabclose 1 au TabClosedPre * tabclose 1
call assert_fails('tabclose', 'E1312') call assert_fails('tabclose', 'E1312:')
" Close other (all) tabs in TabClosedPre autocmd " Close other (all) tabs in TabClosedPre autocmd
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
au TabClosedPre * tabonly au TabClosedPre * tabonly
call assert_fails('tabclose', 'E1312') call assert_fails('tabclose', 'E1312:')
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
au TabClosedPre * tabonly au TabClosedPre * tabonly
call assert_fails('tabclose 2', 'E1312') call assert_fails('tabclose 2', 'E1312:')
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
au TabClosedPre * tabclose 4 au TabClosedPre * tabclose 4
call assert_fails('tabclose 2', 'E1312') call assert_fails('tabclose 2', 'E1312:')
" Open new tabs in TabClosedPre autocmd " Open new tabs in TabClosedPre autocmd
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
au TabClosedPre * tabnew D au TabClosedPre * tabnew D
call assert_fails('tabclose', 'E1312') call assert_fails('tabclose', 'E1312:')
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
au TabClosedPre * tabnew D au TabClosedPre * tabnew D
call assert_fails('tabclose 1', 'E1312') call assert_fails('tabclose 1', 'E1312:')
" Moving the tab page in TabClosedPre autocmd " Moving the tab page in TabClosedPre autocmd
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
@@ -4783,10 +4783,10 @@ func Test_autocmd_tabclosedpre()
" Create new windows in TabClosedPre autocmd " Create new windows in TabClosedPre autocmd
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
au TabClosedPre * split | e X| vsplit | e Y | split | e Z au TabClosedPre * split | e X| vsplit | e Y | split | e Z
call assert_fails('tabclose', 'E242') call assert_fails('tabclose', 'E242:')
call ClearAutomcdAndCreateTabs() call ClearAutomcdAndCreateTabs()
au TabClosedPre * new X | new Y | new Z au TabClosedPre * new X | new Y | new Z
call assert_fails('tabclose 1', 'E242') call assert_fails('tabclose 1', 'E242:')
" Test directly closing the tab page with ':tabclose' " Test directly closing the tab page with ':tabclose'
au! au!

4
test/old/testdir/test_blob.vim
View File

@@ -229,13 +229,13 @@ func Test_blob_compare()
VAR b1 = 0z0011 VAR b1 = 0z0011
echo b1 == 9 echo b1 == 9
END END
call CheckLegacyAndVim9Failure(lines, ['E977:', 'E1072', 'E1072']) call CheckLegacyAndVim9Failure(lines, ['E977:', 'E1072:', 'E1072:'])
let lines =<< trim END let lines =<< trim END
VAR b1 = 0z0011 VAR b1 = 0z0011
echo b1 != 9 echo b1 != 9
END END
call CheckLegacyAndVim9Failure(lines, ['E977:', 'E1072', 'E1072']) call CheckLegacyAndVim9Failure(lines, ['E977:', 'E1072:', 'E1072:'])
let lines =<< trim END let lines =<< trim END
VAR b1 = 0z0011 VAR b1 = 0z0011

2
test/old/testdir/test_edit.vim
View File

@@ -2123,7 +2123,7 @@ endfunc
func Test_read_invalid() func Test_read_invalid()
" set encoding=latin1 " set encoding=latin1
" This was not properly checking for going past the end. " This was not properly checking for going past the end.
call assert_fails('r`=', 'E484') call assert_fails('r`=', 'E484:')
set encoding=utf-8 set encoding=utf-8
endfunc endfunc

6
test/old/testdir/test_expr.vim
View File

@@ -213,10 +213,10 @@ func Test_method_with_prefix()
call CheckLegacyAndVim9Success(lines) call CheckLegacyAndVim9Success(lines)
call assert_equal([0, 1, 2], --3->range()) call assert_equal([0, 1, 2], --3->range())
call CheckDefAndScriptFailure(['eval --3->range()'], 'E15') call CheckDefAndScriptFailure(['eval --3->range()'], 'E15:')
call assert_equal(1, !+-+0) call assert_equal(1, !+-+0)
call CheckDefAndScriptFailure(['eval !+-+0'], 'E15') call CheckDefAndScriptFailure(['eval !+-+0'], 'E15:')
endfunc endfunc
func Test_option_value() func Test_option_value()
@@ -836,7 +836,7 @@ endfunc
" Test for errors in expression evaluation " Test for errors in expression evaluation
func Test_expr_eval_error() func Test_expr_eval_error()
call CheckLegacyAndVim9Failure(["VAR i = 'abc' .. []"], ['E730:', 'E1105:', 'E730:']) call CheckLegacyAndVim9Failure(["VAR i = 'abc' .. []"], ['E730:', 'E1105:', 'E730:'])
call CheckLegacyAndVim9Failure(["VAR l = [] + 10"], ['E745:', 'E1051:', 'E745']) call CheckLegacyAndVim9Failure(["VAR l = [] + 10"], ['E745:', 'E1051:', 'E745:'])
call CheckLegacyAndVim9Failure(["VAR v = 10 + []"], ['E745:', 'E1051:', 'E745:']) call CheckLegacyAndVim9Failure(["VAR v = 10 + []"], ['E745:', 'E1051:', 'E745:'])
call CheckLegacyAndVim9Failure(["VAR v = 10 / []"], ['E745:', 'E1036:', 'E745:']) call CheckLegacyAndVim9Failure(["VAR v = 10 / []"], ['E745:', 'E1036:', 'E745:'])
call CheckLegacyAndVim9Failure(["VAR v = -{}"], ['E728:', 'E1012:', 'E728:']) call CheckLegacyAndVim9Failure(["VAR v = -{}"], ['E728:', 'E1012:', 'E728:'])

2
test/old/testdir/test_listdict.vim
View File

@@ -1366,7 +1366,7 @@ func Test_listdict_index()
call CheckLegacyAndVim9Failure(['VAR d = {"k": 10}', 'echo d[1 : 2]'], 'E719:') call CheckLegacyAndVim9Failure(['VAR d = {"k": 10}', 'echo d[1 : 2]'], 'E719:')
call assert_fails("let v = [4, 6][{-> 1}]", 'E729:') call assert_fails("let v = [4, 6][{-> 1}]", 'E729:')
call CheckDefAndScriptFailure(['var v = [4, 6][() => 1]'], ['E1012', 'E703:']) call CheckDefAndScriptFailure(['var v = [4, 6][() => 1]'], ['E1012:', 'E703:'])
call CheckLegacyAndVim9Failure(['VAR v = range(5)[2 : []]'], ['E730:', 'E1012:', 'E730:']) call CheckLegacyAndVim9Failure(['VAR v = range(5)[2 : []]'], ['E730:', 'E1012:', 'E730:'])

4
test/old/testdir/test_startup.vim
View File

@@ -1356,7 +1356,7 @@ func Test_cq_zero_exmode()
let logfile = 'Xcq_log.txt' let logfile = 'Xcq_log.txt'
let out = system(GetVimCommand() .. ' --clean --log ' .. logfile .. ' -es -X -c "argdelete foobar" -c"7cq"') let out = system(GetVimCommand() .. ' --clean --log ' .. logfile .. ' -es -X -c "argdelete foobar" -c"7cq"')
call assert_equal(8, v:shell_error) call assert_equal(8, v:shell_error)
let log = filter(readfile(logfile), {idx, val -> val =~ "E480"}) let log = filter(readfile(logfile), {idx, val -> val =~ "E480:"})
call assert_match('E480: No match: foobar', log[0]) call assert_match('E480: No match: foobar', log[0])
call delete(logfile) call delete(logfile)
@@ -1367,7 +1367,7 @@ func Test_cq_zero_exmode()
else else
call assert_equal(256, v:shell_error) call assert_equal(256, v:shell_error)
endif endif
let log = filter(readfile(logfile), {idx, val -> val =~ "E480"}) let log = filter(readfile(logfile), {idx, val -> val =~ "E480:"})
call assert_match('E480: No match: foobar', log[0]) call assert_match('E480: No match: foobar', log[0])
call delete('Xcq_log.txt') call delete('Xcq_log.txt')
endfunc endfunc

12
test/old/testdir/test_trycatch.vim
View File

@@ -1850,7 +1850,7 @@ func T75_R()
Xpath 'f' Xpath 'f'
finally finally
Xpath 'g' Xpath 'g'
if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21' if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
Xpath 'h' Xpath 'h'
endif endif
break " discard error for $VIMNOERRTHROW break " discard error for $VIMNOERRTHROW
@@ -1877,7 +1877,7 @@ func Test_builtin_func_error()
Xpath 'k' Xpath 'k'
finally finally
Xpath 'l' Xpath 'l'
if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21' if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
Xpath 'm' Xpath 'm'
endif endif
break " discard error for $VIMNOERRTHROW break " discard error for $VIMNOERRTHROW
@@ -1896,7 +1896,7 @@ func Test_builtin_func_error()
Xpath 'o' Xpath 'o'
finally finally
Xpath 'p' Xpath 'p'
if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21' if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
Xpath 'q' Xpath 'q'
endif endif
break " discard error for $VIMNOERRTHROW break " discard error for $VIMNOERRTHROW
@@ -1915,7 +1915,7 @@ func Test_builtin_func_error()
Xpath 's' Xpath 's'
finally finally
Xpath 't' Xpath 't'
if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21' if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
Xpath 'u' Xpath 'u'
endif endif
break " discard error for $VIMNOERRTHROW break " discard error for $VIMNOERRTHROW
@@ -1938,7 +1938,7 @@ func Test_builtin_func_error()
Xpath 'x' Xpath 'x'
finally finally
Xpath 'y' Xpath 'y'
if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21' if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
Xpath 'z' Xpath 'z'
endif endif
break " discard error for $VIMNOERRTHROW break " discard error for $VIMNOERRTHROW
@@ -1958,7 +1958,7 @@ func Test_builtin_func_error()
Xpath 'B' Xpath 'B'
finally finally
Xpath 'C' Xpath 'C'
if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21' if caught || $VIMNOERRTHROW && v:errmsg =~ 'E21:'
Xpath 'D' Xpath 'D'
endif endif
call assert_equal('a', x) call assert_equal('a', x)

4
test/old/testdir/test_usercommands.vim
View File

@@ -320,13 +320,13 @@ func Test_CmdErrors()
vim9script vim9script
com! -complete=file DoCmd : com! -complete=file DoCmd :
END END
call CheckScriptFailure(lines, 'E1208', 2) call CheckScriptFailure(lines, 'E1208:', 2)
let lines =<< trim END let lines =<< trim END
vim9script vim9script
com! -nargs=0 -complete=file DoCmd : com! -nargs=0 -complete=file DoCmd :
END END
call CheckScriptFailure(lines, 'E1208', 2) call CheckScriptFailure(lines, 'E1208:', 2)
com! -nargs=0 DoCmd : com! -nargs=0 DoCmd :
call assert_fails('DoCmd x', 'E488:') call assert_fails('DoCmd x', 'E488:')