patch 8.2.0731: Vim9: parsing declarations continues after :finish
Problem: Vim9: parsing declarations continues after :finish.
Solution: Bail out when encountering :finish.
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 0b99eec..e85da5a 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1705,6 +1705,23 @@
], '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
diff --git a/src/version.c b/src/version.c
index d89763b..efb3c31 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 731,
+/**/
730,
/**/
729,
diff --git a/src/vim9script.c b/src/vim9script.c
index 8bc1962..4d7e8ee 100644
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -130,6 +130,12 @@
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.