Patch 8.2.4892
Problem: Test failures because of changed error messages.
Solution: Adjust the exptected error messages.
Files: src/testdir/test_vim9_assign.vim,
src/testdir/test_vim9_builtin.vim, src/testdir/test_vim9_expr.vim,
src/testdir/test_vim9_func.vim, src/testdir/test_vim9_script.vim,
src/testdir/test_expand.vim, src/testdir/test_tcl.vim,
src/testdir/test_vimscript.vim
*** ../vim-8.2.4891/src/testdir/test_vim9_assign.vim 2022-05-06
14:29:04.637209906 +0100
--- src/testdir/test_vim9_assign.vim 2022-05-06 17:38:23.274402150 +0100
***************
*** 293,299 ****
var ls: list<string> = []
ls[-1] ..= 'foo'
END
! v9.CheckDefExecAndScriptFailure(lines, 'E684: list index out of range: -1',
2)
enddef
def Test_assign_register()
--- 293,299 ----
var ls: list<string> = []
ls[-1] ..= 'foo'
END
! v9.CheckDefExecAndScriptFailure(lines, 'E684: List index out of range: -1',
2)
enddef
def Test_assign_register()
***************
*** 1641,1647 ****
l[g:idx : 1] = [0]
echo l
END
! v9.CheckDefExecAndScriptFailure(lines, 'E684: list index out of range: 3')
lines =<< trim END
var l = [1, 2]
--- 1641,1647 ----
l[g:idx : 1] = [0]
echo l
END
! v9.CheckDefExecAndScriptFailure(lines, 'E684: List index out of range: 3')
lines =<< trim END
var l = [1, 2]
*** ../vim-8.2.4891/src/testdir/test_vim9_builtin.vim 2022-05-06
11:21:13.961097837 +0100
--- src/testdir/test_vim9_builtin.vim 2022-05-06 17:40:29.914210706 +0100
***************
*** 2157,2163 ****
CheckFeature job
else
v9.CheckDefAndScriptFailure(['job_getchannel("a")'], ['E1013: Argument 1:
type mismatch, expected job but got string', 'E1218: Job required for argument
1'])
! assert_fails('job_getchannel(test_null_job())', 'E916: not a valid job')
endif
enddef
--- 2157,2163 ----
CheckFeature job
else
v9.CheckDefAndScriptFailure(['job_getchannel("a")'], ['E1013: Argument 1:
type mismatch, expected job but got string', 'E1218: Job required for argument
1'])
! assert_fails('job_getchannel(test_null_job())', 'E916: Not a valid job')
endif
enddef
***************
*** 2166,2172 ****
CheckFeature job
else
v9.CheckDefAndScriptFailure(['job_info("a")'], ['E1013: Argument 1: type
mismatch, expected job but got string', 'E1218: Job required for argument 1'])
! assert_fails('job_info(test_null_job())', 'E916: not a valid job')
endif
enddef
--- 2166,2172 ----
CheckFeature job
else
v9.CheckDefAndScriptFailure(['job_info("a")'], ['E1013: Argument 1: type
mismatch, expected job but got string', 'E1218: Job required for argument 1'])
! assert_fails('job_info(test_null_job())', 'E916: Not a valid job')
endif
enddef
***************
*** 4071,4078 ****
assert_equal('AX234', res)
if has('job')
! assert_fails('"text"->substitute(".*", () => test_null_job(), "")',
'E908: using an invalid value as a String: job')
! assert_fails('"text"->substitute(".*", () => test_null_channel(), "")',
'E908: using an invalid value as a String: channel')
endif
v9.CheckDefAndScriptFailure(['substitute(1, "b", "1", "d")'], ['E1013:
Argument 1: type mismatch, expected string but got number', 'E1174: String
required for argument 1'])
v9.CheckDefAndScriptFailure(['substitute("a", 2, "1", "d")'], ['E1013:
Argument 2: type mismatch, expected string but got number', 'E1174: String
required for argument 2'])
--- 4071,4078 ----
assert_equal('AX234', res)
if has('job')
! assert_fails('"text"->substitute(".*", () => test_null_job(), "")',
'E908: Using an invalid value as a String: job')
! assert_fails('"text"->substitute(".*", () => test_null_channel(), "")',
'E908: Using an invalid value as a String: channel')
endif
v9.CheckDefAndScriptFailure(['substitute(1, "b", "1", "d")'], ['E1013:
Argument 1: type mismatch, expected string but got number', 'E1174: String
required for argument 1'])
v9.CheckDefAndScriptFailure(['substitute("a", 2, "1", "d")'], ['E1013:
Argument 2: type mismatch, expected string but got number', 'E1174: String
required for argument 2'])
*** ../vim-8.2.4891/src/testdir/test_vim9_expr.vim 2022-04-27
17:54:20.151363237 +0100
--- src/testdir/test_vim9_expr.vim 2022-05-06 17:41:22.410136725 +0100
***************
*** 3114,3120 ****
v9.CheckDefExecAndScriptFailure(['echo g:testblob[2]'], 'E979:', 1)
v9.CheckDefExecAndScriptFailure(['echo g:testblob[-3]'], 'E979:', 1)
! v9.CheckDefExecAndScriptFailure(['echo g:testlist[4]'], 'E684: list index
out of range: 4', 1)
v9.CheckDefExecAndScriptFailure(['echo g:testlist[-5]'], 'E684:', 1)
v9.CheckDefExecAndScriptFailure(['echo g:testdict["a" : "b"]'], 'E719:', 1)
--- 3114,3120 ----
v9.CheckDefExecAndScriptFailure(['echo g:testblob[2]'], 'E979:', 1)
v9.CheckDefExecAndScriptFailure(['echo g:testblob[-3]'], 'E979:', 1)
! v9.CheckDefExecAndScriptFailure(['echo g:testlist[4]'], 'E684: List index
out of range: 4', 1)
v9.CheckDefExecAndScriptFailure(['echo g:testlist[-5]'], 'E684:', 1)
v9.CheckDefExecAndScriptFailure(['echo g:testdict["a" : "b"]'], 'E719:', 1)
*** ../vim-8.2.4891/src/testdir/test_vim9_func.vim 2022-04-09
11:09:03.526052266 +0100
--- src/testdir/test_vim9_func.vim 2022-05-06 17:44:46.065873323 +0100
***************
*** 3709,3715 ****
var buf = g:RunVimInTerminal('-S XTest_opfunc_error', {rows: 6,
wait_for_ruler: 0})
g:WaitForAssert(() => assert_match('Press ENTER', term_getline(buf, 6)))
! g:WaitForAssert(() => assert_match('E684: list index out of range: 0',
term_getline(buf, 5)))
# clean up
g:StopVimInTerminal(buf)
--- 3709,3715 ----
var buf = g:RunVimInTerminal('-S XTest_opfunc_error', {rows: 6,
wait_for_ruler: 0})
g:WaitForAssert(() => assert_match('Press ENTER', term_getline(buf, 6)))
! g:WaitForAssert(() => assert_match('E684: List index out of range: 0',
term_getline(buf, 5)))
# clean up
g:StopVimInTerminal(buf)
*** ../vim-8.2.4891/src/testdir/test_vim9_script.vim 2022-05-06
13:37:39.315678663 +0100
--- src/testdir/test_vim9_script.vim 2022-05-06 17:41:49.918099074 +0100
***************
*** 1527,1533 ****
source Xtestscript.vim
catch /E684/
# function name should contain <SNR> every time
! assert_match('E684: list index out of range', v:exception)
assert_match('function <SNR>\d\+_Func, line 1', v:throwpoint)
endtry
endfor
--- 1527,1533 ----
source Xtestscript.vim
catch /E684/
# function name should contain <SNR> every time
! assert_match('E684: List index out of range', v:exception)
assert_match('function <SNR>\d\+_Func, line 1', v:throwpoint)
endtry
endfor
*** ../vim-8.2.4891/src/testdir/test_expand.vim 2022-04-14 15:39:39.281754582
+0100
--- src/testdir/test_expand.vim 2022-05-06 17:43:03.858001303 +0100
***************
*** 141,147 ****
if RunVim([], [], '--clean -s Xscript')
call assert_equal([
\ 'E1274: No script file name to substitute for "<script>"',
! \ 'E498: no :source file name to substitute for "<sfile>"'],
\ readfile('Xresult'))
endif
call delete('Xscript')
--- 141,147 ----
if RunVim([], [], '--clean -s Xscript')
call assert_equal([
\ 'E1274: No script file name to substitute for "<script>"',
! \ 'E498: No :source file name to substitute for "<sfile>"'],
\ readfile('Xresult'))
endif
call delete('Xscript')
*** ../vim-8.2.4891/src/testdir/test_tcl.vim 2021-05-16 19:06:55.500792069
+0100
--- src/testdir/test_tcl.vim 2022-05-06 17:51:21.609432686 +0100
***************
*** 711,717 ****
call assert_fails('tcl exit x', 'expected integer but got "x"')
tcl set foo "foo"
! call assert_fails('tcl exit 3', 'E572: exit code 3')
" The Tcl interpreter should have been deleted and a new one
" is re-created with the next :tcl command.
--- 711,717 ----
call assert_fails('tcl exit x', 'expected integer but got "x"')
tcl set foo "foo"
! call assert_fails('tcl exit 3', 'E572: Exit code 3')
" The Tcl interpreter should have been deleted and a new one
" is re-created with the next :tcl command.
*** ../vim-8.2.4891/src/testdir/test_vimscript.vim 2022-04-03
16:58:57.001128067 +0100
--- src/testdir/test_vimscript.vim 2022-05-06 17:51:57.125396106 +0100
***************
*** 3077,3083 ****
endif
END
call writefile(code, 'Xtest')
! call AssertException(['source Xtest'], 'Vim(else):E583: multiple :else')
" :elseif after :else
let code =<< trim END
--- 3077,3083 ----
endif
END
call writefile(code, 'Xtest')
! call AssertException(['source Xtest'], 'Vim(else):E583: Multiple :else')
" :elseif after :else
let code =<< trim END
*** ../vim-8.2.4891/src/version.c 2022-05-06 16:32:21.569543796 +0100
--- src/version.c 2022-05-06 17:52:32.977359535 +0100
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 4892,
/**/
--
An actual excerpt from a classified section of a city newspaper:
"Illiterate? Write today for free help!"
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20220506165334.3D53F1C03B1%40moolenaar.net.
