To: vim_dev@googlegroups.com Subject: Patch 8.2.2886 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2886 Problem: Various pieces of code not covered by tests. Solution: Add a few more tests. (Yegappan Lakshmanan, closes #8255) Files: src/testdir/test_expr.vim, src/testdir/test_functions.vim, src/testdir/test_listdict.vim, src/testdir/test_registers.vim, src/testdir/test_user_func.vim, src/testdir/test_vim9_builtin.vim, src/testdir/test_vim9_expr.vim, src/testdir/test_vim9_func.vim *** ../vim-8.2.2885/src/testdir/test_expr.vim 2020-11-27 19:13:24.186184976 +0100 --- src/testdir/test_expr.vim 2021-05-25 20:09:53.457338641 +0200 *************** *** 127,132 **** --- 127,133 ---- let y = x call add(x, 'foo') call assert_equal(['foo'], y) + call assert_fails('call getreg([])', 'E730:') endfunc func Test_loop_over_null_list() *** ../vim-8.2.2885/src/testdir/test_functions.vim 2021-05-24 15:15:41.779049851 +0200 --- src/testdir/test_functions.vim 2021-05-25 20:09:53.457338641 +0200 *************** *** 141,146 **** --- 141,147 ---- call assert_fails('call min(1)', 'E712:') call assert_fails('call min(v:none)', 'E712:') + call assert_fails('call min([1, {}])', 'E728:') " check we only get one error call assert_fails('call min([[1], #{}])', ['E745:', 'E745:']) *************** *** 715,720 **** --- 716,722 ---- call assert_fails("let s=tr('abcd', 'abcd', 'def')", 'E475:') call assert_equal('hEllO', tr('hello', 'eo', 'EO')) call assert_equal('hello', tr('hello', 'xy', 'ab')) + call assert_fails('call tr("abc", "123", "₁₂")', 'E475:') set encoding=utf8 endfunc *************** *** 2674,2677 **** --- 2676,2684 ---- call assert_equal('msg', HasDefault()) endfunc + " Test for gettext() + func Test_gettext() + call assert_fails('call gettext(1)', 'E475:') + endfunc + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.2885/src/testdir/test_listdict.vim 2021-05-13 14:55:51.620360842 +0200 --- src/testdir/test_listdict.vim 2021-05-25 20:09:53.457338641 +0200 *************** *** 513,518 **** --- 513,523 ---- call assert_equal(expected[depth][u][1], ps) endfor endfor + " Deleting a list range should fail if the range is locked + let l = [1, 2, 3, 4] + lockvar l[1:2] + call assert_fails('unlet l[1:2]', 'E741:') + unlet l endfunc " Locked variables and :unlet or list / dict functions *** ../vim-8.2.2885/src/testdir/test_registers.vim 2021-03-15 18:36:16.725494781 +0100 --- src/testdir/test_registers.vim 2021-05-25 20:09:53.461338632 +0200 *************** *** 281,286 **** --- 281,287 ---- func Test_set_register() call assert_fails("call setreg('#', 200)", 'E86:') + call assert_fails("call setreg('a', test_unknown())", 'E908:') edit Xfile_alt_1 let b1 = bufnr('') *************** *** 470,475 **** --- 471,484 ---- let info = getreginfo('"') call assert_equal('z', info.points_to) + let @a="a1b2" + nnoremap let g:RegInfo = getreginfo() + exe "normal \"a\" + call assert_equal({'regcontents': ['a1b2'], 'isunnamed': v:false, + \ 'regtype': 'v'}, g:RegInfo) + nunmap + unlet g:RegInfo + bwipe! endfunc *** ../vim-8.2.2885/src/testdir/test_user_func.vim 2021-05-24 15:15:41.779049851 +0200 --- src/testdir/test_user_func.vim 2021-05-25 20:09:53.461338632 +0200 *************** *** 160,165 **** --- 160,175 ---- \ .. "1 return deepcopy(a:)\n" \ .. " endfunction", \ execute('func Args2')) + + " Error in default argument expression + let l =<< trim END + func F1(x = y) + return a:x * 2 + endfunc + echo F1() + END + let @a = l->join("\n") + call assert_fails("exe @a", 'E121:') endfunc func s:addFoo(lead) *** ../vim-8.2.2885/src/testdir/test_vim9_builtin.vim 2021-05-18 17:49:55.372503123 +0200 --- src/testdir/test_vim9_builtin.vim 2021-05-25 20:09:53.461338632 +0200 *************** *** 363,368 **** --- 363,369 ---- END CheckDefAndScriptSuccess(lines) + CheckDefFailure(['extend("a", 1)'], 'E1013: Argument 1: type mismatch, expected list but got string') CheckDefFailure(['extend([1, 2], 3)'], 'E1013: Argument 2: type mismatch, expected list but got number') CheckDefFailure(['extend([1, 2], ["x"])'], 'E1013: Argument 2: type mismatch, expected list but got list') CheckDefFailure(['extend([1, 2], [3], "x")'], 'E1013: Argument 3: type mismatch, expected number but got string') *************** *** 726,731 **** --- 727,738 ---- endfor res->assert_equal(6) + var m: any = [] + insert(m, 4) + call assert_equal([4], m) + extend(m, [6], 0) + call assert_equal([6, 4], m) + var lines =<< trim END insert(test_null_list(), 123) END *************** *** 743,748 **** --- 750,756 ---- assert_equal(['a', 'b', 'c'], insert(['b', 'c'], 'a')) assert_equal(0z1234, insert(0z34, 0x12)) + CheckDefFailure(['insert("a", 1)'], 'E1013: Argument 1: type mismatch, expected list but got string', 1) CheckDefFailure(['insert([2, 3], "a")'], 'E1013: Argument 2: type mismatch, expected number but got string', 1) CheckDefFailure(['insert([2, 3], 1, "x")'], 'E1013: Argument 3: type mismatch, expected number but got string', 1) enddef *** ../vim-8.2.2885/src/testdir/test_vim9_expr.vim 2021-05-24 15:15:41.779049851 +0200 --- src/testdir/test_vim9_expr.vim 2021-05-25 20:09:53.461338632 +0200 *************** *** 1580,1585 **** --- 1580,1587 ---- var ln: list = [g:anint, g:thefour] var nr = 234 assert_equal(234, nr) + var b: bool = 1 + assert_equal(true, b) var text = 'text' *************** *** 1591,1596 **** --- 1593,1599 ---- CheckDefAndScriptFailure(["var x = 123"], 'E1010:', 1) CheckDefFailure(["var x = "], 'E1097:', 3) + CheckDefFailure(["var x = string(1)"], 'E1012:', 1) CheckScriptFailure(['vim9script', "var x = "], 'E15:', 2) CheckDefAndScriptFailure(["var x = 123"], 'E1068:', 1) CheckDefAndScriptFailure(["var x = )', 'echo "a"', 'enddef'], 'E1069:') + CheckScriptFailure(['def Func7(...x: int)', 'echo "a"', 'enddef'], 'E1010:') enddef def Test_white_space_before_comma() *************** *** 2717,2722 **** --- 2720,2730 ---- var _ = 1 END CheckDefAndScriptFailure(lines, 'E1181:', 1) + + lines =<< trim END + var x = _ + END + CheckDefAndScriptFailure(lines, 'E1181:', 1) enddef def Test_too_many_arguments() *** ../vim-8.2.2885/src/version.c 2021-05-24 22:56:10.114989225 +0200 --- src/version.c 2021-05-25 20:11:21.937134709 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2886, /**/ -- Windows M!uqoms /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///