To: vim_dev@googlegroups.com Subject: Patch 8.2.1681 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1681 Problem: Vim9: unnessary :call commands in tests. Solution: Remove the commands. (issue #6936) Files: src/testdir/test_vim9_func.vim, src/testdir/test_vim9_script.vim *** ../vim-8.2.1680/src/testdir/test_vim9_func.vim 2020-09-12 18:32:30.683427305 +0200 --- src/testdir/test_vim9_func.vim 2020-09-14 16:58:01.406082480 +0200 *************** *** 279,285 **** enddef Func([]) END ! call CheckScriptFailure(lines, 'E1013: argument 1: type mismatch, expected string but got list', 5) enddef " Default arg and varargs --- 279,285 ---- enddef Func([]) END ! CheckScriptFailure(lines, 'E1013: argument 1: type mismatch, expected string but got list', 5) enddef " Default arg and varargs *************** *** 1099,1105 **** enddef defcompile END ! call writefile(lines, 'Xdef') try source Xdef assert_report('should have failed') --- 1099,1105 ---- enddef defcompile END ! writefile(lines, 'Xdef') try source Xdef assert_report('should have failed') *************** *** 1119,1125 **** enddef defcompile END ! call writefile(lines, 'Xdef') try source Xdef assert_report('should have failed') --- 1119,1125 ---- enddef defcompile END ! writefile(lines, 'Xdef') try source Xdef assert_report('should have failed') *************** *** 1138,1144 **** defcompile Func() END ! call writefile(lines, 'Xdef') try source Xdef assert_report('should have failed') --- 1138,1144 ---- defcompile Func() END ! writefile(lines, 'Xdef') try source Xdef assert_report('should have failed') *************** *** 1146,1152 **** v:throwpoint->assert_match('_Func, line 3$') endtry ! call delete('Xdef') enddef def Test_deleted_function() --- 1146,1152 ---- v:throwpoint->assert_match('_Func, line 3$') endtry ! delete('Xdef') enddef def Test_deleted_function() *** ../vim-8.2.1680/src/testdir/test_vim9_script.vim 2020-09-13 18:57:43.514555271 +0200 --- src/testdir/test_vim9_script.vim 2020-09-14 17:03:08.600952764 +0200 *************** *** 319,325 **** list3 += ['end'] assert_equal(['sdf', 'asdf', 'end'], list3) - CheckDefExecFailure(['let ll = [1, 2, 3]', 'll[-4] = 6'], 'E684:') CheckDefExecFailure(['let [v1, v2] = [1, 2]'], 'E1092:') --- 319,324 ---- *************** *** 367,373 **** enddef assert_equal(#{a: 43}, FillDict()) END ! call CheckScriptSuccess(lines) lines =<< trim END vim9script --- 366,372 ---- enddef assert_equal(#{a: 43}, FillDict()) END ! CheckScriptSuccess(lines) lines =<< trim END vim9script *************** *** 378,384 **** enddef FillDict() END ! call CheckScriptFailure(lines, 'E1103:') # assignment to global dict lines =<< trim END --- 377,383 ---- enddef FillDict() END ! CheckScriptFailure(lines, 'E1103:') # assignment to global dict lines =<< trim END *************** *** 390,396 **** enddef assert_equal(#{a: 43}, FillDict()) END ! call CheckScriptSuccess(lines) # assignment to buffer dict lines =<< trim END --- 389,395 ---- enddef assert_equal(#{a: 43}, FillDict()) END ! CheckScriptSuccess(lines) # assignment to buffer dict lines =<< trim END *************** *** 402,408 **** enddef assert_equal(#{a: 43}, FillDict()) END ! call CheckScriptSuccess(lines) enddef def Test_assignment_local() --- 401,407 ---- enddef assert_equal(#{a: 43}, FillDict()) END ! CheckScriptSuccess(lines) enddef def Test_assignment_local() *************** *** 440,446 **** enddef call Test_assignment_local_internal() END ! call CheckScriptSuccess(script_lines) enddef def Test_assignment_default() --- 439,445 ---- enddef call Test_assignment_local_internal() END ! CheckScriptSuccess(script_lines) enddef def Test_assignment_default() *************** *** 794,830 **** CheckScriptSuccess(lines) enddef ! func Test_wrong_type() ! call CheckDefFailure(['let var: list'], 'E1010:') ! call CheckDefFailure(['let var: list>'], 'E1010:') ! call CheckDefFailure(['let var: dict'], 'E1010:') ! call CheckDefFailure(['let var: dict>'], 'E1010:') ! ! call CheckDefFailure(['let var: dict'], 'E1009:') ! ! call CheckDefFailure(['let var: ally'], 'E1010:') ! call CheckDefFailure(['let var: bram'], 'E1010:') ! call CheckDefFailure(['let var: cathy'], 'E1010:') ! call CheckDefFailure(['let var: dom'], 'E1010:') ! call CheckDefFailure(['let var: freddy'], 'E1010:') ! call CheckDefFailure(['let var: john'], 'E1010:') ! call CheckDefFailure(['let var: larry'], 'E1010:') ! call CheckDefFailure(['let var: ned'], 'E1010:') ! call CheckDefFailure(['let var: pam'], 'E1010:') ! call CheckDefFailure(['let var: sam'], 'E1010:') ! call CheckDefFailure(['let var: vim'], 'E1010:') ! ! call CheckDefFailure(['let Ref: number', 'Ref()'], 'E1085:') ! call CheckDefFailure(['let Ref: string', 'let res = Ref()'], 'E1085:') ! endfunc ! ! func Test_const() ! call CheckDefFailure(['const var = 234', 'var = 99'], 'E1018:') ! call CheckDefFailure(['const one = 234', 'let one = 99'], 'E1017:') ! call CheckDefFailure(['const two'], 'E1021:') ! call CheckDefFailure(['const &option'], 'E996:') ! endfunc def Test_range_no_colon() CheckDefFailure(['%s/a/b/'], 'E1050:') --- 793,829 ---- CheckScriptSuccess(lines) enddef ! def Test_wrong_type() ! CheckDefFailure(['let var: list'], 'E1010:') ! CheckDefFailure(['let var: list>'], 'E1010:') ! CheckDefFailure(['let var: dict'], 'E1010:') ! CheckDefFailure(['let var: dict>'], 'E1010:') ! ! CheckDefFailure(['let var: dict'], 'E1009:') ! ! CheckDefFailure(['let var: ally'], 'E1010:') ! CheckDefFailure(['let var: bram'], 'E1010:') ! CheckDefFailure(['let var: cathy'], 'E1010:') ! CheckDefFailure(['let var: dom'], 'E1010:') ! CheckDefFailure(['let var: freddy'], 'E1010:') ! CheckDefFailure(['let var: john'], 'E1010:') ! CheckDefFailure(['let var: larry'], 'E1010:') ! CheckDefFailure(['let var: ned'], 'E1010:') ! CheckDefFailure(['let var: pam'], 'E1010:') ! CheckDefFailure(['let var: sam'], 'E1010:') ! CheckDefFailure(['let var: vim'], 'E1010:') ! ! CheckDefFailure(['let Ref: number', 'Ref()'], 'E1085:') ! CheckDefFailure(['let Ref: string', 'let res = Ref()'], 'E1085:') ! enddef ! ! def Test_const() ! CheckDefFailure(['const var = 234', 'var = 99'], 'E1018:') ! CheckDefFailure(['const one = 234', 'let one = 99'], 'E1017:') ! CheckDefFailure(['const two'], 'E1021:') ! CheckDefFailure(['const &option'], 'E996:') ! enddef def Test_range_no_colon() CheckDefFailure(['%s/a/b/'], 'E1050:') *************** *** 844,854 **** assert_equal(1, outer) enddef ! func Test_block_failure() ! call CheckDefFailure(['{', 'let inner = 1', '}', 'echo inner'], 'E1001:') ! call CheckDefFailure(['}'], 'E1025:') ! call CheckDefFailure(['{', 'echo 1'], 'E1026:') ! endfunc func g:NoSuchFunc() echo 'none' --- 843,853 ---- assert_equal(1, outer) enddef ! def Test_block_failure() ! CheckDefFailure(['{', 'let inner = 1', '}', 'echo inner'], 'E1001:') ! CheckDefFailure(['}'], 'E1025:') ! CheckDefFailure(['{', 'echo 1'], 'E1026:') ! enddef func g:NoSuchFunc() echo 'none' *** ../vim-8.2.1680/src/version.c 2020-09-14 16:50:01.751887481 +0200 --- src/version.c 2020-09-14 17:03:37.372847545 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 1681, /**/ -- Lawmakers made it obligatory for everybody to take at least one bath each week -- on Saturday night. [real standing law in Vermont, United States of America] /// Bram Moolenaar -- Bram@Moolenaar.net -- 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 ///