Mercurial > vim

diff src/testdir/vim9.vim @ 21863:809b1e7fbd72 v8.2.1481

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1481: Vim9: line number reported with error may be wrong Commit: https://github.com/vim/vim/commit/3affe7a6c6fc813f5d29857933ee6aca0b9c7bd6 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Aug 18 20:34:13 2020 +0200 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.
author Bram Moolenaar <Bram@vim.org>
date Tue, 18 Aug 2020 20:45:03 +0200
parents 3e5d0832a2e7
children a211bca98bc3
line wrap: on
line diff
--- a/src/testdir/vim9.vim
+++ b/src/testdir/vim9.vim
@@ -10,24 +10,28 @@ endfunc
 
 " 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