diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 21 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 7849a340ab..4d28996d55 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -6665,6 +6665,7 @@ static struct fst { { "argv", 0, 1, f_argv }, { "asin", 1, 1, f_asin }, // WJMc { "assert_equal", 2, 3, f_assert_equal }, + { "assert_exception", 1, 2, f_assert_exception }, { "assert_false", 1, 2, f_assert_false }, { "assert_true", 1, 2, f_assert_true }, { "atan", 1, 1, f_atan }, @@ -7628,6 +7629,26 @@ static void f_assert_equal(typval_T *argvars, typval_T *rettv) } } +/// "assert_exception(string[, msg])" function +static void f_assert_exception(typval_T *argvars, typval_T *rettv) +{ + garray_T ga; + + char *error = (char *)get_tv_string_chk(&argvars[0]); + if (vimvars[VV_EXCEPTION].vv_str == NULL) { + prepare_assert_error(&ga); + ga_concat(&ga, (char_u *)"v:exception is not set"); + assert_error(&ga); + ga_clear(&ga); + } else if (strstr((char *)vimvars[VV_EXCEPTION].vv_str, error) == NULL) { + prepare_assert_error(&ga); + fill_assert_error(&ga, &argvars[1], NULL, &argvars[0], + &vimvars[VV_EXCEPTION].vv_tv); + assert_error(&ga); + ga_clear(&ga); + } +} + // Common for assert_true() and assert_false(). static void assert_bool(typval_T *argvars, bool is_true) { diff --git a/src/nvim/version.c b/src/nvim/version.c index ed16b1b0d5..e913d84223 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -585,7 +585,7 @@ static int included_patches[] = { // 1095 NA // 1094, 1093, - // 1092, + 1092, // 1091, // 1090, 1089, |