Patch 8.2.1965
Problem: Vim9: tests fail without the channel feature.
Solution: Check if the channel feature is present. (Dominique Pellé,
closes 7270)
Files: src/testdir/test_vim9_expr.vim
*** ../vim-8.2.1964/src/testdir/test_vim9_expr.vim 2020-11-04
13:38:24.297472668 +0100
--- src/testdir/test_vim9_expr.vim 2020-11-07 13:07:27.349458689 +0100
***************
*** 1292,1317 ****
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 + [3]"], 'E1051', 1)
! call CheckDefFailure(["var x = 0z1122 + 'asd'"], 'E1051', 1)
! call CheckDefFailure(["var x = 33 + 0z1122"], 'E1051', 1)
! call CheckDefFailure(["var x = [3] + 0z1122"], 'E1051', 1)
! call CheckDefFailure(["var x = 'asdf' + 0z1122"], 'E1051', 1)
! call CheckDefFailure(["var x = 6 + xxx"], 'E1001', 1)
!
! call CheckDefFailure(["var x = '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' .. 0z32"], 'E1105', 1)
! call CheckDefFailure(["var x = 'a' .. function('len')"], 'E1105', 1)
! call CheckDefFailure(["var x = 'a' .. function('len', ['a'])"], 'E1105', 1)
endfunc
func Test_expr5_fails_channel()
CheckFeature channel
! call CheckDefFailure(["var x = 'a' .. test_null_job()"], 'E1105', 1)
! call CheckDefFailure(["var x = 'a' .. test_null_channel()"], 'E1105', 1)
endfunc
" test multiply, divide, modulo
--- 1292,1317 ----
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 + [3]"], 'E1051:', 1)
! call CheckDefFailure(["var x = 0z1122 + 'asd'"], 'E1051:', 1)
! call CheckDefFailure(["var x = 33 + 0z1122"], 'E1051:', 1)
! call CheckDefFailure(["var x = [3] + 0z1122"], 'E1051:', 1)
! call CheckDefFailure(["var x = 'asdf' + 0z1122"], 'E1051:', 1)
! call CheckDefFailure(["var x = 6 + xxx"], 'E1001:', 1)
!
! call CheckDefFailure(["var x = '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' .. 0z32"], 'E1105:', 1)
! call CheckDefFailure(["var x = 'a' .. function('len')"], 'E1105:', 1)
! call CheckDefFailure(["var x = 'a' .. function('len', ['a'])"], 'E1105:', 1)
endfunc
func Test_expr5_fails_channel()
CheckFeature channel
! call CheckDefFailure(["var x = 'a' .. test_null_job()"], 'E1105:', 1)
! call CheckDefFailure(["var x = 'a' .. test_null_channel()"], 'E1105:', 1)
endfunc
" test multiply, divide, modulo
***************
*** 1352,1358 ****
* yf[0])
endif
! CheckDefFailure(["var x = 6 * xxx"], 'E1001', 1)
enddef
def Test_expr6_vim9script()
--- 1352,1358 ----
* yf[0])
endif
! CheckDefFailure(["var x = 6 * xxx"], 'E1001:', 1)
enddef
def Test_expr6_vim9script()
***************
*** 1757,1763 ****
enddef
var list = [Failing]
END
! CheckScriptFailure(lines, 'E119:', 1)
enddef
def LambdaWithComments(): func
--- 1757,1767 ----
enddef
var list = [Failing]
END
! if has('channel')
! CheckScriptFailure(lines, 'E119:', 1)
! else
! CheckScriptFailure(lines, 'E117:', 1)
! endif
enddef
def LambdaWithComments(): func
***************
*** 2028,2034 ****
enddef
var dict = #{name: Failing}
END
! CheckScriptFailure(lines, 'E119:', 1)
enddef
let g:oneString = 'one'
--- 2032,2042 ----
enddef
var dict = #{name: Failing}
END
! if has('channel')
! CheckScriptFailure(lines, 'E119:', 1)
! else
! CheckScriptFailure(lines, 'E117:', 1)
! endif
enddef
let g:oneString = 'one'
*** ../vim-8.2.1964/src/version.c 2020-11-06 18:52:51.281206341 +0100
--- src/version.c 2020-11-07 13:08:29.405266697 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 1965,
/**/
--
hundred-and-one symptoms of being an internet addict:
212. Your Internet group window has more icons than your Accessories window.
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/202011071211.0A7CB4eV674767%40masaka.moolenaar.net.
