aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.1681: Vim9: unnessary :call commands in tests

Browse Source 
Problem:    Vim9: unnessary :call commands in tests.
Solution:   Remove the commands. (issue #6936)
This commit is contained in:
Bram Moolenaar
2020-09-14 17:04:31 +02:00
parent eb26f4331f
commit 08052228a7
3 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/testdir/test_vim9_func.vim
View File

@@ -279,7 +279,7 @@ def Test_call_wrong_args()
enddef enddef
Func([]) Func([])
END END
call CheckScriptFailure(lines, 'E1013: argument 1: type mismatch, expected string but got list<unknown>', 5) CheckScriptFailure(lines, 'E1013: argument 1: type mismatch, expected string but got list<unknown>', 5)
enddef enddef
" Default arg and varargs " Default arg and varargs
@@ -1099,7 +1099,7 @@ def Test_error_reporting()
enddef enddef
defcompile defcompile
END END
call writefile(lines, 'Xdef') writefile(lines, 'Xdef')
try try
source Xdef source Xdef
assert_report('should have failed') assert_report('should have failed')
@@ -1119,7 +1119,7 @@ def Test_error_reporting()
enddef enddef
defcompile defcompile
END END
call writefile(lines, 'Xdef') writefile(lines, 'Xdef')
try try
source Xdef source Xdef
assert_report('should have failed') assert_report('should have failed')
@@ -1138,7 +1138,7 @@ def Test_error_reporting()
defcompile defcompile
Func() Func()
END END
call writefile(lines, 'Xdef') writefile(lines, 'Xdef')
try try
source Xdef source Xdef
assert_report('should have failed') assert_report('should have failed')
@@ -1146,7 +1146,7 @@ def Test_error_reporting()
v:throwpoint->assert_match('_Func, line 3$') v:throwpoint->assert_match('_Func, line 3$')
endtry endtry
call delete('Xdef') delete('Xdef')
enddef enddef
def Test_deleted_function() def Test_deleted_function()

75
src/testdir/test_vim9_script.vim
View File

@@ -319,7 +319,6 @@ def Test_assignment_list()
list3 += ['end'] list3 += ['end']
assert_equal(['sdf', 'asdf', 'end'], list3) assert_equal(['sdf', 'asdf', 'end'], list3)
CheckDefExecFailure(['let ll = [1, 2, 3]', 'll[-4] = 6'], 'E684:') CheckDefExecFailure(['let ll = [1, 2, 3]', 'll[-4] = 6'], 'E684:')
CheckDefExecFailure(['let [v1, v2] = [1, 2]'], 'E1092:') CheckDefExecFailure(['let [v1, v2] = [1, 2]'], 'E1092:')
@@ -367,7 +366,7 @@ def Test_assignment_dict()
enddef enddef
assert_equal(#{a: 43}, FillDict()) assert_equal(#{a: 43}, FillDict())
END END
call CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
@@ -378,7 +377,7 @@ def Test_assignment_dict()
enddef enddef
FillDict() FillDict()
END END
call CheckScriptFailure(lines, 'E1103:') CheckScriptFailure(lines, 'E1103:')
# assignment to global dict # assignment to global dict
lines =<< trim END lines =<< trim END
@@ -390,7 +389,7 @@ def Test_assignment_dict()
enddef enddef
assert_equal(#{a: 43}, FillDict()) assert_equal(#{a: 43}, FillDict())
END END
call CheckScriptSuccess(lines) CheckScriptSuccess(lines)
# assignment to buffer dict # assignment to buffer dict
lines =<< trim END lines =<< trim END
@@ -402,7 +401,7 @@ def Test_assignment_dict()
enddef enddef
assert_equal(#{a: 43}, FillDict()) assert_equal(#{a: 43}, FillDict())
END END
call CheckScriptSuccess(lines) CheckScriptSuccess(lines)
enddef enddef
def Test_assignment_local() def Test_assignment_local()
@@ -440,7 +439,7 @@ def Test_assignment_local()
enddef enddef
call Test_assignment_local_internal() call Test_assignment_local_internal()
END END
call CheckScriptSuccess(script_lines) CheckScriptSuccess(script_lines)
enddef enddef
def Test_assignment_default() def Test_assignment_default()
@@ -794,37 +793,37 @@ def Test_delfunction()
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
enddef enddef
func Test_wrong_type() def Test_wrong_type()
call CheckDefFailure(['let var: list<nothing>'], 'E1010:') CheckDefFailure(['let var: list<nothing>'], 'E1010:')
call CheckDefFailure(['let var: list<list<nothing>>'], 'E1010:') CheckDefFailure(['let var: list<list<nothing>>'], 'E1010:')
call CheckDefFailure(['let var: dict<nothing>'], 'E1010:') CheckDefFailure(['let var: dict<nothing>'], 'E1010:')
call CheckDefFailure(['let var: dict<dict<nothing>>'], 'E1010:') CheckDefFailure(['let var: dict<dict<nothing>>'], 'E1010:')
call CheckDefFailure(['let var: dict<number'], 'E1009:') CheckDefFailure(['let var: dict<number'], 'E1009:')
call CheckDefFailure(['let var: dict<list<number>'], 'E1009:') CheckDefFailure(['let var: dict<list<number>'], 'E1009:')
call CheckDefFailure(['let var: ally'], 'E1010:') CheckDefFailure(['let var: ally'], 'E1010:')
call CheckDefFailure(['let var: bram'], 'E1010:') CheckDefFailure(['let var: bram'], 'E1010:')
call CheckDefFailure(['let var: cathy'], 'E1010:') CheckDefFailure(['let var: cathy'], 'E1010:')
call CheckDefFailure(['let var: dom'], 'E1010:') CheckDefFailure(['let var: dom'], 'E1010:')
call CheckDefFailure(['let var: freddy'], 'E1010:') CheckDefFailure(['let var: freddy'], 'E1010:')
call CheckDefFailure(['let var: john'], 'E1010:') CheckDefFailure(['let var: john'], 'E1010:')
call CheckDefFailure(['let var: larry'], 'E1010:') CheckDefFailure(['let var: larry'], 'E1010:')
call CheckDefFailure(['let var: ned'], 'E1010:') CheckDefFailure(['let var: ned'], 'E1010:')
call CheckDefFailure(['let var: pam'], 'E1010:') CheckDefFailure(['let var: pam'], 'E1010:')
call CheckDefFailure(['let var: sam'], 'E1010:') CheckDefFailure(['let var: sam'], 'E1010:')
call CheckDefFailure(['let var: vim'], 'E1010:') CheckDefFailure(['let var: vim'], 'E1010:')
call CheckDefFailure(['let Ref: number', 'Ref()'], 'E1085:') CheckDefFailure(['let Ref: number', 'Ref()'], 'E1085:')
call CheckDefFailure(['let Ref: string', 'let res = Ref()'], 'E1085:') CheckDefFailure(['let Ref: string', 'let res = Ref()'], 'E1085:')
endfunc enddef
func Test_const() def Test_const()
call CheckDefFailure(['const var = 234', 'var = 99'], 'E1018:') CheckDefFailure(['const var = 234', 'var = 99'], 'E1018:')
call CheckDefFailure(['const one = 234', 'let one = 99'], 'E1017:') CheckDefFailure(['const one = 234', 'let one = 99'], 'E1017:')
call CheckDefFailure(['const two'], 'E1021:') CheckDefFailure(['const two'], 'E1021:')
call CheckDefFailure(['const &option'], 'E996:') CheckDefFailure(['const &option'], 'E996:')
endfunc enddef
def Test_range_no_colon() def Test_range_no_colon()
CheckDefFailure(['%s/a/b/'], 'E1050:') CheckDefFailure(['%s/a/b/'], 'E1050:')
@@ -844,11 +843,11 @@ def Test_block()
assert_equal(1, outer) assert_equal(1, outer)
enddef enddef
func Test_block_failure() def Test_block_failure()
call CheckDefFailure(['{', 'let inner = 1', '}', 'echo inner'], 'E1001:') CheckDefFailure(['{', 'let inner = 1', '}', 'echo inner'], 'E1001:')
call CheckDefFailure(['}'], 'E1025:') CheckDefFailure(['}'], 'E1025:')
call CheckDefFailure(['{', 'echo 1'], 'E1026:') CheckDefFailure(['{', 'echo 1'], 'E1026:')
endfunc enddef
func g:NoSuchFunc() func g:NoSuchFunc()
echo 'none' echo 'none'

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 */
/**/
1681,
/**/ /**/
1680, 1680,
/**/ /**/