Skip to content

Commit 750802b

Browse files
committed
patch 8.2.0311: Vim9: insufficient script tests
Problem: Vim9: insufficient script tests. Solution: Add tests. Free imports when re-using a script.
1 parent 8fb1b47 commit 750802b

3 files changed

Lines changed: 27 additions & 0 deletions

File tree

src/scriptfile.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,9 @@ do_source(
12841284
di = HI2DI(hi);
12851285
di->di_flags |= DI_FLAGS_RELOAD;
12861286
}
1287+
1288+
// old imports are no longer valid
1289+
free_imports(sid);
12871290
}
12881291
else
12891292
{

src/testdir/test_vim9_script.vim

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,30 @@ def Test_vim9script()
333333
delete('Ximport.vim')
334334
delete('Xexport.vim')
335335

336+
" Check that in a Vim9 script 'cpo' is set to the Vim default.
337+
set cpo&vi
338+
let cpo_before = &cpo
339+
let lines =<< trim END
340+
vim9script
341+
g:cpo_in_vim9script = &cpo
342+
END
343+
writefile(lines, 'Xvim9_script')
344+
source Xvim9_script
345+
assert_equal(cpo_before, &cpo)
346+
set cpo&vim
347+
assert_equal(&cpo, g:cpo_in_vim9script)
348+
delete('Xvim9_script')
349+
enddef
350+
351+
def Test_vim9script_fails()
336352
CheckScriptFailure(['scriptversion 2', 'vim9script'], 'E1039:')
337353
CheckScriptFailure(['vim9script', 'scriptversion 2'], 'E1040:')
354+
CheckScriptFailure(['export let some = 123'], 'E1042:')
355+
CheckScriptFailure(['vim9script', 'export let g:some'], 'E1044:')
356+
CheckScriptFailure(['vim9script', 'export echo 134'], 'E1043:')
357+
358+
assert_fails('vim9script', 'E1038')
359+
assert_fails('export something', 'E1042')
338360
enddef
339361

340362
def Test_vim9script_call()

src/version.c

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

739739
static int included_patches[] =
740740
{ /* Add new patch number below this line */
741+
/**/
742+
311,
741743
/**/
742744
310,
743745
/**/

0 commit comments

Comments
 (0)