Skip to content

Commit 0805222

Browse files
committed
patch 8.2.1681: Vim9: unnessary :call commands in tests
Problem: Vim9: unnessary :call commands in tests. Solution: Remove the commands. (issue #6936)
1 parent eb26f43 commit 0805222

3 files changed

Lines changed: 47 additions & 46 deletions

File tree

src/testdir/test_vim9_func.vim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ def Test_call_wrong_args()
279279
enddef
280280
Func([])
281281
END
282-
call CheckScriptFailure(lines, 'E1013: argument 1: type mismatch, expected string but got list<unknown>', 5)
282+
CheckScriptFailure(lines, 'E1013: argument 1: type mismatch, expected string but got list<unknown>', 5)
283283
enddef
284284

285285
" Default arg and varargs
@@ -1099,7 +1099,7 @@ def Test_error_reporting()
10991099
enddef
11001100
defcompile
11011101
END
1102-
call writefile(lines, 'Xdef')
1102+
writefile(lines, 'Xdef')
11031103
try
11041104
source Xdef
11051105
assert_report('should have failed')
@@ -1119,7 +1119,7 @@ def Test_error_reporting()
11191119
enddef
11201120
defcompile
11211121
END
1122-
call writefile(lines, 'Xdef')
1122+
writefile(lines, 'Xdef')
11231123
try
11241124
source Xdef
11251125
assert_report('should have failed')
@@ -1138,15 +1138,15 @@ def Test_error_reporting()
11381138
defcompile
11391139
Func()
11401140
END
1141-
call writefile(lines, 'Xdef')
1141+
writefile(lines, 'Xdef')
11421142
try
11431143
source Xdef
11441144
assert_report('should have failed')
11451145
catch /E716:/
11461146
v:throwpoint->assert_match('_Func, line 3$')
11471147
endtry
11481148

1149-
call delete('Xdef')
1149+
delete('Xdef')
11501150
enddef
11511151

11521152
def Test_deleted_function()

src/testdir/test_vim9_script.vim

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ def Test_assignment_list()
319319
list3 += ['end']
320320
assert_equal(['sdf', 'asdf', 'end'], list3)
321321

322-
323322
CheckDefExecFailure(['let ll = [1, 2, 3]', 'll[-4] = 6'], 'E684:')
324323
CheckDefExecFailure(['let [v1, v2] = [1, 2]'], 'E1092:')
325324

@@ -367,7 +366,7 @@ def Test_assignment_dict()
367366
enddef
368367
assert_equal(#{a: 43}, FillDict())
369368
END
370-
call CheckScriptSuccess(lines)
369+
CheckScriptSuccess(lines)
371370

372371
lines =<< trim END
373372
vim9script
@@ -378,7 +377,7 @@ def Test_assignment_dict()
378377
enddef
379378
FillDict()
380379
END
381-
call CheckScriptFailure(lines, 'E1103:')
380+
CheckScriptFailure(lines, 'E1103:')
382381

383382
# assignment to global dict
384383
lines =<< trim END
@@ -390,7 +389,7 @@ def Test_assignment_dict()
390389
enddef
391390
assert_equal(#{a: 43}, FillDict())
392391
END
393-
call CheckScriptSuccess(lines)
392+
CheckScriptSuccess(lines)
394393

395394
# assignment to buffer dict
396395
lines =<< trim END
@@ -402,7 +401,7 @@ def Test_assignment_dict()
402401
enddef
403402
assert_equal(#{a: 43}, FillDict())
404403
END
405-
call CheckScriptSuccess(lines)
404+
CheckScriptSuccess(lines)
406405
enddef
407406

408407
def Test_assignment_local()
@@ -440,7 +439,7 @@ def Test_assignment_local()
440439
enddef
441440
call Test_assignment_local_internal()
442441
END
443-
call CheckScriptSuccess(script_lines)
442+
CheckScriptSuccess(script_lines)
444443
enddef
445444

446445
def Test_assignment_default()
@@ -794,37 +793,37 @@ def Test_delfunction()
794793
CheckScriptSuccess(lines)
795794
enddef
796795

797-
func Test_wrong_type()
798-
call CheckDefFailure(['let var: list<nothing>'], 'E1010:')
799-
call CheckDefFailure(['let var: list<list<nothing>>'], 'E1010:')
800-
call CheckDefFailure(['let var: dict<nothing>'], 'E1010:')
801-
call CheckDefFailure(['let var: dict<dict<nothing>>'], 'E1010:')
802-
803-
call CheckDefFailure(['let var: dict<number'], 'E1009:')
804-
call CheckDefFailure(['let var: dict<list<number>'], 'E1009:')
805-
806-
call CheckDefFailure(['let var: ally'], 'E1010:')
807-
call CheckDefFailure(['let var: bram'], 'E1010:')
808-
call CheckDefFailure(['let var: cathy'], 'E1010:')
809-
call CheckDefFailure(['let var: dom'], 'E1010:')
810-
call CheckDefFailure(['let var: freddy'], 'E1010:')
811-
call CheckDefFailure(['let var: john'], 'E1010:')
812-
call CheckDefFailure(['let var: larry'], 'E1010:')
813-
call CheckDefFailure(['let var: ned'], 'E1010:')
814-
call CheckDefFailure(['let var: pam'], 'E1010:')
815-
call CheckDefFailure(['let var: sam'], 'E1010:')
816-
call CheckDefFailure(['let var: vim'], 'E1010:')
817-
818-
call CheckDefFailure(['let Ref: number', 'Ref()'], 'E1085:')
819-
call CheckDefFailure(['let Ref: string', 'let res = Ref()'], 'E1085:')
820-
endfunc
796+
def Test_wrong_type()
797+
CheckDefFailure(['let var: list<nothing>'], 'E1010:')
798+
CheckDefFailure(['let var: list<list<nothing>>'], 'E1010:')
799+
CheckDefFailure(['let var: dict<nothing>'], 'E1010:')
800+
CheckDefFailure(['let var: dict<dict<nothing>>'], 'E1010:')
821801

822-
func Test_const()
823-
call CheckDefFailure(['const var = 234', 'var = 99'], 'E1018:')
824-
call CheckDefFailure(['const one = 234', 'let one = 99'], 'E1017:')
825-
call CheckDefFailure(['const two'], 'E1021:')
826-
call CheckDefFailure(['const &option'], 'E996:')
827-
endfunc
802+
CheckDefFailure(['let var: dict<number'], 'E1009:')
803+
CheckDefFailure(['let var: dict<list<number>'], 'E1009:')
804+
805+
CheckDefFailure(['let var: ally'], 'E1010:')
806+
CheckDefFailure(['let var: bram'], 'E1010:')
807+
CheckDefFailure(['let var: cathy'], 'E1010:')
808+
CheckDefFailure(['let var: dom'], 'E1010:')
809+
CheckDefFailure(['let var: freddy'], 'E1010:')
810+
CheckDefFailure(['let var: john'], 'E1010:')
811+
CheckDefFailure(['let var: larry'], 'E1010:')
812+
CheckDefFailure(['let var: ned'], 'E1010:')
813+
CheckDefFailure(['let var: pam'], 'E1010:')
814+
CheckDefFailure(['let var: sam'], 'E1010:')
815+
CheckDefFailure(['let var: vim'], 'E1010:')
816+
817+
CheckDefFailure(['let Ref: number', 'Ref()'], 'E1085:')
818+
CheckDefFailure(['let Ref: string', 'let res = Ref()'], 'E1085:')
819+
enddef
820+
821+
def Test_const()
822+
CheckDefFailure(['const var = 234', 'var = 99'], 'E1018:')
823+
CheckDefFailure(['const one = 234', 'let one = 99'], 'E1017:')
824+
CheckDefFailure(['const two'], 'E1021:')
825+
CheckDefFailure(['const &option'], 'E996:')
826+
enddef
828827

829828
def Test_range_no_colon()
830829
CheckDefFailure(['%s/a/b/'], 'E1050:')
@@ -844,11 +843,11 @@ def Test_block()
844843
assert_equal(1, outer)
845844
enddef
846845

847-
func Test_block_failure()
848-
call CheckDefFailure(['{', 'let inner = 1', '}', 'echo inner'], 'E1001:')
849-
call CheckDefFailure(['}'], 'E1025:')
850-
call CheckDefFailure(['{', 'echo 1'], 'E1026:')
851-
endfunc
846+
def Test_block_failure()
847+
CheckDefFailure(['{', 'let inner = 1', '}', 'echo inner'], 'E1001:')
848+
CheckDefFailure(['}'], 'E1025:')
849+
CheckDefFailure(['{', 'echo 1'], 'E1026:')
850+
enddef
852851

853852
func g:NoSuchFunc()
854853
echo 'none'

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
1681,
753755
/**/
754756
1680,
755757
/**/

0 commit comments

Comments
 (0)