0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 8.2.0731: Vim9: parsing declarations continues after :finish

Problem:    Vim9: parsing declarations continues after :finish.
Solution:   Bail out when encountering :finish.
This commit is contained in:
Bram Moolenaar 2020-05-10 21:20:29 +02:00
parent 1cc2a94f80
commit 7e5bd91dc9
3 changed files with 25 additions and 0 deletions

View File

@ -1705,6 +1705,23 @@ def Test_vim9_comment_not_compiled()
], 'E488:')
enddef
def Test_finish()
let lines =<< trim END
vim9script
let g:res = 'one'
if v:false | finish | endif
let g:res = 'two'
finish
let g:res = 'three'
END
writefile(lines, 'Xfinished')
source Xfinished
assert_equal('two', g:res)
unlet g:res
delete('Xfinished')
enddef
" Keep this last, it messes up highlighting.
def Test_substitute_cmd()
new

View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
731,
/**/
730,
/**/

View File

@ -130,6 +130,12 @@ ex_vim9script(exarg_T *eap)
vim_free(((char_u **)(gap->ga_data))[--gap->ga_len]);
((char_u **)(gap->ga_data))[gap->ga_len++] = NULL;
}
else if (checkforcmd(&p, "finish", 4))
{
// TODO: this should not happen below "if false".
// Use "if cond | finish | endif as a workaround.
break;
}
}
// Compile the :def functions.