patch 8.2.1481: Vim9: line number reported with error may be wrong
Problem: Vim9: line number reported with error may be wrong.
Solution: Check line number in tests.
diff --git a/src/testdir/vim9.vim b/src/testdir/vim9.vim
index c890b0c..823a6ca 100644
--- a/src/testdir/vim9.vim
+++ b/src/testdir/vim9.vim
@@ -10,24 +10,28 @@
" Check that "lines" inside ":def" results in an "error" message.
" If "lnum" is given check that the error is reported for this line.
-func CheckDefFailure(lines, error, lnum = -1)
- call writefile(['def Func()'] + a:lines + ['enddef', 'defcompile'], 'Xdef')
- call assert_fails('so Xdef', a:error, a:lines, a:lnum)
+" Add a line before and after to make it less likely that the line number is
+" accidentally correct.
+func CheckDefFailure(lines, error, lnum = -3)
+ call writefile(['def Func()', '# comment'] + a:lines + ['#comment', 'enddef', 'defcompile'], 'Xdef')
+ call assert_fails('so Xdef', a:error, a:lines, a:lnum + 1)
call delete('Xdef')
endfunc
" Check that "lines" inside ":def" results in an "error" message when executed.
" If "lnum" is given check that the error is reported for this line.
-func CheckDefExecFailure(lines, error, lnum = -1)
- call writefile(['def Func()'] + a:lines + ['enddef'], 'Xdef')
+" Add a line before and after to make it less likely that the line number is
+" accidentally correct.
+func CheckDefExecFailure(lines, error, lnum = -3)
+ call writefile(['def Func()', '# comment'] + a:lines + ['#comment', 'enddef'], 'Xdef')
so Xdef
- call assert_fails('call Func()', a:error, a:lines, a:lnum)
+ call assert_fails('call Func()', a:error, a:lines, a:lnum + 1)
call delete('Xdef')
endfunc
-def CheckScriptFailure(lines: list<string>, error: string)
+def CheckScriptFailure(lines: list<string>, error: string, lnum = -3)
writefile(lines, 'Xdef')
- assert_fails('so Xdef', error, lines)
+ assert_fails('so Xdef', error, lines, lnum)
delete('Xdef')
enddef