mirror of
https://github.com/vim/vim.git
synced 2025-10-04 05:25:06 -04:00
patch 8.2.2529: Vim9: Not possible to use legacy and Vim9 script in one file
Problem: Vim9: Not possible to use legacy and Vim9 script in one file. Solution: Vim9: allow for "if false" before :vim9script. (closes #7851)
This commit is contained in:
@@ -2595,8 +2595,12 @@ do_one_cmd(
|
||||
|
||||
#ifdef FEAT_EVAL
|
||||
// Set flag that any command was executed, used by ex_vim9script().
|
||||
// Not if this was a command that wasn't executed or :endif.
|
||||
if (getline_equal(ea.getline, ea.cookie, getsourceline)
|
||||
&& current_sctx.sc_sid > 0)
|
||||
&& current_sctx.sc_sid > 0
|
||||
&& ea.cmdidx != CMD_endif
|
||||
&& (cstack->cs_idx < 0
|
||||
|| (cstack->cs_flags[cstack->cs_idx] & CSF_ACTIVE)))
|
||||
SCRIPT_ITEM(current_sctx.sc_sid)->sn_state = SN_STATE_HAD_COMMAND;
|
||||
|
||||
/*
|
||||
|
@@ -1262,6 +1262,27 @@ def Test_use_import_in_mapping()
|
||||
nunmap <F3>
|
||||
enddef
|
||||
|
||||
def Test_vim9script_mix()
|
||||
var lines =<< trim END
|
||||
if has(g:feature)
|
||||
" legacy script
|
||||
let g:legacy = 1
|
||||
finish
|
||||
endif
|
||||
vim9script
|
||||
g:legacy = 0
|
||||
END
|
||||
g:feature = 'eval'
|
||||
g:legacy = -1
|
||||
CheckScriptSuccess(lines)
|
||||
assert_equal(1, g:legacy)
|
||||
|
||||
g:feature = 'noteval'
|
||||
g:legacy = -1
|
||||
CheckScriptSuccess(lines)
|
||||
assert_equal(0, g:legacy)
|
||||
enddef
|
||||
|
||||
def Test_vim9script_fails()
|
||||
CheckScriptFailure(['scriptversion 2', 'vim9script'], 'E1039:')
|
||||
CheckScriptFailure(['vim9script', 'scriptversion 2'], 'E1040:')
|
||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
2529,
|
||||
/**/
|
||||
2528,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user