summaryrefslogtreecommitdiff
path: root/src/testdir
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-21 22:36:47 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-21 22:36:47 +0200
commit7cb6fc29d067ed97c0b0c1d2d5767125ef9ae1ab (patch)
treea5307e1932b80df92df373384835b4c90b6db628 /src/testdir
parent81e17fbe00fd2ed93b262adc3ba41c86b02e7f46 (diff)
downloadvim-git-7cb6fc29d067ed97c0b0c1d2d5767125ef9ae1ab.tar.gz
patch 8.2.1504: Vim9: white space checks are only done for a :def functionv8.2.1504
Problem: Vim9: white space checks are only done for a :def function. Solution: Also do checks at the script level. Adjust the name of a few error messages.
Diffstat (limited to 'src/testdir')
-rw-r--r--src/testdir/test_vim9_expr.vim3
-rw-r--r--src/testdir/vim9.vim7
2 files changed, 9 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 911f4ea89..d9e823aa7 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -2336,7 +2336,8 @@ func Test_expr_fails()
call CheckDefFailure(["let x = '1'isnot2"], 'E488:', 1)
call CheckDefFailure(["CallMe ('yes')"], 'E476:', 1)
- call CheckDefFailure(["CallMe2('yes','no')"], 'E1069:', 1)
+ call CheckScriptFailure(["CallMe ('yes')"], 'E492:', 1)
+ call CheckScriptAndDefFailure(["CallMe2('yes','no')"], 'E1069:', 1)
call CheckDefFailure(["CallMe2('yes' , 'no')"], 'E1068:', 1)
call CheckDefFailure(["v:nosuch += 3"], 'E1001:', 1)
diff --git a/src/testdir/vim9.vim b/src/testdir/vim9.vim
index 823a6caf5..2f92cf954 100644
--- a/src/testdir/vim9.vim
+++ b/src/testdir/vim9.vim
@@ -40,3 +40,10 @@ def CheckScriptSuccess(lines: list<string>)
so Xdef
delete('Xdef')
enddef
+
+" Check that a command fails both when used in a :def function and when used
+" in Vim9 script.
+def CheckScriptAndDefFailure(lines: list<string>, error: string, lnum = -3)
+ CheckDefFailure(lines, error, lnum)
+ CheckScriptFailure(['vim9script'] + lines, error, lnum + 1)
+enddef