diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-12-03 20:27:09 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-12-03 21:21:47 +0800 |
| commit | 3838ee63d0af8021b506b8d1c3bb9a4ce961fb8c (patch) | |
| tree | 989244c505f4de51dd42da91202da39360ef1f39 | |
| parent | 742d95a6294e79e35d3227f749ad2dd6558d62b2 (diff) | |
| download | rneovim-3838ee63d0af8021b506b8d1c3bb9a4ce961fb8c.tar.gz rneovim-3838ee63d0af8021b506b8d1c3bb9a4ce961fb8c.tar.bz2 rneovim-3838ee63d0af8021b506b8d1c3bb9a4ce961fb8c.zip | |
test(old): skip Vim9 script with less divergence
| -rw-r--r-- | src/nvim/testdir/test_functions.vim | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_ins_complete.vim | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_normal.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_tagfunc.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/vim9.vim | 6 |
5 files changed, 15 insertions, 6 deletions
diff --git a/src/nvim/testdir/test_functions.vim b/src/nvim/testdir/test_functions.vim index 1308beeae5..f3594d3cdc 100644 --- a/src/nvim/testdir/test_functions.vim +++ b/src/nvim/testdir/test_functions.vim @@ -2,6 +2,9 @@ source shared.vim source check.vim +source term_util.vim +source screendump.vim +source vim9.vim " Must be done first, since the alternate buffer must be unset. func Test_00_bufexists() @@ -2518,7 +2521,7 @@ func Test_builtin_check() vim9script var s:trim = (x) => " " .. x END - " call CheckScriptFailure(lines, 'E704:') + call CheckScriptFailure(lines, 'E704:') call assert_fails('call extend(g:, #{foo: { -> "foo" }})', 'E704:') let g:bar = 123 diff --git a/src/nvim/testdir/test_ins_complete.vim b/src/nvim/testdir/test_ins_complete.vim index 1811c82767..c1c78e9a8f 100644 --- a/src/nvim/testdir/test_ins_complete.vim +++ b/src/nvim/testdir/test_ins_complete.vim @@ -1535,7 +1535,7 @@ func Test_completefunc_callback() assert_equal([[1, ''], [0, 'three']], g:LocalCompleteFuncArgs) bw! END - " call CheckScriptSuccess(lines) + call CheckScriptSuccess(lines) " cleanup set completefunc& @@ -1792,7 +1792,7 @@ func Test_omnifunc_callback() assert_equal([[1, ''], [0, 'three']], g:LocalOmniFuncArgs) bw! END - " call CheckScriptSuccess(lines) + call CheckScriptSuccess(lines) " cleanup set omnifunc& @@ -2085,7 +2085,7 @@ func Test_thesaurusfunc_callback() assert_equal([[1, ''], [0, 'three']], g:LocalTsrFuncArgs) bw! END - " call CheckScriptSuccess(lines) + call CheckScriptSuccess(lines) " cleanup set thesaurusfunc& diff --git a/src/nvim/testdir/test_normal.vim b/src/nvim/testdir/test_normal.vim index 7e8b8c5eef..c2ad49f0c9 100644 --- a/src/nvim/testdir/test_normal.vim +++ b/src/nvim/testdir/test_normal.vim @@ -695,7 +695,7 @@ func Test_opfunc_callback() assert_equal(['char'], g:LocalOpFuncArgs) bw! END - " call CheckScriptSuccess(lines) + call CheckScriptSuccess(lines) " setting 'opfunc' to a script local function outside of a script context " should fail diff --git a/src/nvim/testdir/test_tagfunc.vim b/src/nvim/testdir/test_tagfunc.vim index 93b9c67b25..cba96d3504 100644 --- a/src/nvim/testdir/test_tagfunc.vim +++ b/src/nvim/testdir/test_tagfunc.vim @@ -380,7 +380,7 @@ func Test_tagfunc_callback() assert_equal(['a12', '', {}], g:LocalTagFuncArgs) bw! END - " call CheckScriptSuccess(lines) + call CheckScriptSuccess(lines) " cleanup delfunc TagFunc1 diff --git a/src/nvim/testdir/vim9.vim b/src/nvim/testdir/vim9.vim index d598683d81..3c0ff2b2dd 100644 --- a/src/nvim/testdir/vim9.vim +++ b/src/nvim/testdir/vim9.vim @@ -3,6 +3,9 @@ let s:sequence = 1 func CheckScriptFailure(lines, error, lnum = -3) + if get(a:lines, 0, '') ==# 'vim9script' + return + endif let cwd = getcwd() let fname = 'XScriptFailure' .. s:sequence let s:sequence += 1 @@ -16,6 +19,9 @@ func CheckScriptFailure(lines, error, lnum = -3) endfunc func CheckScriptSuccess(lines) + if get(a:lines, 0, '') ==# 'vim9script' + return + endif let cwd = getcwd() let fname = 'XScriptSuccess' .. s:sequence let s:sequence += 1 |