patch 8.2.3099: Vim9: missing catch/finally not reported at script level
Problem: Vim9: missing catch/finally not reported at script level.
Solution: Give an error. (closes #8487)
diff --git a/src/ex_eval.c b/src/ex_eval.c
index d68e792..dac70ab 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -1670,6 +1670,8 @@
for (idx = cstack->cs_idx; idx > 0; --idx)
if (cstack->cs_flags[idx] & CSF_TRY)
break;
+ if (cstack->cs_flags[idx] & CSF_TRY)
+ cstack->cs_flags[idx] |= CSF_CATCH;
if (cstack->cs_flags[idx] & CSF_FINALLY)
{
// Give up for a ":catch" after ":finally" and ignore it.
@@ -1963,8 +1965,8 @@
* made inactive by a ":continue", ":break", ":return", or ":finish" in
* the finally clause. The latter case need not be tested since then
* anything pending has already been discarded. */
- skip = did_emsg || got_int || did_throw ||
- !(cstack->cs_flags[cstack->cs_idx] & CSF_TRUE);
+ skip = did_emsg || got_int || did_throw
+ || !(cstack->cs_flags[cstack->cs_idx] & CSF_TRUE);
if (!(cstack->cs_flags[cstack->cs_idx] & CSF_TRY))
{
@@ -1992,6 +1994,14 @@
{
idx = cstack->cs_idx;
+ if (in_vim9script()
+ && (cstack->cs_flags[idx] & (CSF_CATCH|CSF_FINALLY)) == 0)
+ {
+ // try/endtry without any catch or finally: give an error and
+ // continue.
+ eap->errmsg = _(e_missing_catch_or_finally);
+ }
+
/*
* If we stopped with the exception currently being thrown at this
* try conditional since we didn't know that it doesn't have
diff --git a/src/structs.h b/src/structs.h
index be4082b..f1f8f32 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -936,13 +936,14 @@
# define CSF_TRY 0x0100 // is a ":try"
# define CSF_FINALLY 0x0200 // ":finally" has been passed
-# define CSF_THROWN 0x0400 // exception thrown to this try conditional
-# define CSF_CAUGHT 0x0800 // exception caught by this try conditional
-# define CSF_SILENT 0x1000 // "emsg_silent" reset by ":try"
+# define CSF_CATCH 0x0400 // ":catch" has been seen
+# define CSF_THROWN 0x0800 // exception thrown to this try conditional
+# define CSF_CAUGHT 0x1000 // exception caught by this try conditional
+# define CSF_SILENT 0x2000 // "emsg_silent" reset by ":try"
// Note that CSF_ELSE is only used when CSF_TRY and CSF_WHILE are unset
// (an ":if"), and CSF_SILENT is only used when CSF_TRY is set.
//
-#define CSF_FUNC_DEF 0x2000 // a function was defined in this block
+#define CSF_FUNC_DEF 0x4000 // a function was defined in this block
/*
* What's pending for being reactivated at the ":endtry" of this try
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index dfb1a41..9cf0989 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -603,6 +603,15 @@
CheckScriptSuccess(lines)
assert_match('E808: Number or Float required', g:caught)
unlet g:caught
+
+ # missing catch and/or finally
+ lines =<< trim END
+ vim9script
+ try
+ echo 'something'
+ endtry
+ END
+ CheckScriptFailure(lines, 'E1032:')
enddef
def Test_try_in_catch()
diff --git a/src/version.c b/src/version.c
index 8d391d3..062e856 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3099,
+/**/
3098,
/**/
3097,