vim-patch:7.4.1092

Problem:    It is not simple to test for an exception and give a proper error
            message.
Solution:   Add assert_exception().

https://github.com/vim/vim/commit/a803c7f94070f94b831fdfd1984f288c8b825b5d

1 files changed, 21 insertions, 0 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)
 {