aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00
Code Activity

patch 8.2.1965: Vim9: tests fail without the channel feature

Browse Source 
Problem:    Vim9: tests fail without the channel feature.
Solution:   Check if the channel feature is present. (Dominique Pellé,
            closes 7270)
This commit is contained in:
Bram Moolenaar
2020-11-07 13:09:18 +01:00
parent faebda8cc1
commit 46f479c756
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/testdir/test_vim9_expr.vim
View File

@@ -1292,26 +1292,26 @@ func Test_expr5_fails()
call CheckDefFailure(["var x = '1' ..'2'"], msg, 1) call CheckDefFailure(["var x = '1' ..'2'"], msg, 1)
call CheckDefFailure(["var x = '1'.. '2'"], msg, 1) call CheckDefFailure(["var x = '1'.. '2'"], msg, 1)
call CheckDefFailure(["var x = 0z1122 + 33"], 'E1051', 1) call CheckDefFailure(["var x = 0z1122 + 33"], 'E1051:', 1)
call CheckDefFailure(["var x = 0z1122 + [3]"], 'E1051', 1) call CheckDefFailure(["var x = 0z1122 + [3]"], 'E1051:', 1)
call CheckDefFailure(["var x = 0z1122 + 'asd'"], 'E1051', 1) call CheckDefFailure(["var x = 0z1122 + 'asd'"], 'E1051:', 1)
call CheckDefFailure(["var x = 33 + 0z1122"], 'E1051', 1) call CheckDefFailure(["var x = 33 + 0z1122"], 'E1051:', 1)
call CheckDefFailure(["var x = [3] + 0z1122"], 'E1051', 1) call CheckDefFailure(["var x = [3] + 0z1122"], 'E1051:', 1)
call CheckDefFailure(["var x = 'asdf' + 0z1122"], 'E1051', 1) call CheckDefFailure(["var x = 'asdf' + 0z1122"], 'E1051:', 1)
call CheckDefFailure(["var x = 6 + xxx"], 'E1001', 1) call CheckDefFailure(["var x = 6 + xxx"], 'E1001:', 1)
call CheckDefFailure(["var x = 'a' .. [1]"], 'E1105', 1) call CheckDefFailure(["var x = 'a' .. [1]"], 'E1105:', 1)
call CheckDefFailure(["var x = 'a' .. #{a: 1}"], 'E1105', 1) call CheckDefFailure(["var x = 'a' .. #{a: 1}"], 'E1105:', 1)
call CheckDefFailure(["var x = 'a' .. test_void()"], 'E1105', 1) call CheckDefFailure(["var x = 'a' .. test_void()"], 'E1105:', 1)
call CheckDefFailure(["var x = 'a' .. 0z32"], 'E1105', 1) call CheckDefFailure(["var x = 'a' .. 0z32"], 'E1105:', 1)
call CheckDefFailure(["var x = 'a' .. function('len')"], 'E1105', 1) call CheckDefFailure(["var x = 'a' .. function('len')"], 'E1105:', 1)
call CheckDefFailure(["var x = 'a' .. function('len', ['a'])"], 'E1105', 1) call CheckDefFailure(["var x = 'a' .. function('len', ['a'])"], 'E1105:', 1)
endfunc endfunc
func Test_expr5_fails_channel() func Test_expr5_fails_channel()
CheckFeature channel CheckFeature channel
call CheckDefFailure(["var x = 'a' .. test_null_job()"], 'E1105', 1) call CheckDefFailure(["var x = 'a' .. test_null_job()"], 'E1105:', 1)
call CheckDefFailure(["var x = 'a' .. test_null_channel()"], 'E1105', 1) call CheckDefFailure(["var x = 'a' .. test_null_channel()"], 'E1105:', 1)
endfunc endfunc
" test multiply, divide, modulo " test multiply, divide, modulo
@@ -1352,7 +1352,7 @@ def Test_expr6()
* yf[0]) * yf[0])
endif endif
CheckDefFailure(["var x = 6 * xxx"], 'E1001', 1) CheckDefFailure(["var x = 6 * xxx"], 'E1001:', 1)
enddef enddef
def Test_expr6_vim9script() def Test_expr6_vim9script()
@@ -1757,7 +1757,11 @@ def Test_expr7_list_vim9script()
enddef enddef
var list = [Failing] var list = [Failing]
END END
CheckScriptFailure(lines, 'E119:', 1) if has('channel')
CheckScriptFailure(lines, 'E119:', 1)
else
CheckScriptFailure(lines, 'E117:', 1)
endif
enddef enddef
def LambdaWithComments(): func def LambdaWithComments(): func
@@ -2028,7 +2032,11 @@ def Test_expr7_dict_vim9script()
enddef enddef
var dict = #{name: Failing} var dict = #{name: Failing}
END END
CheckScriptFailure(lines, 'E119:', 1) if has('channel')
CheckScriptFailure(lines, 'E119:', 1)
else
CheckScriptFailure(lines, 'E117:', 1)
endif
enddef enddef
let g:oneString = 'one' let g:oneString = 'one'

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1965,
/**/ /**/
1964, 1964,
/**/ /**/