diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-09-21 17:03:46 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-09-21 14:03:46 -0700 |
| commit | b3e56957f8e9468497e5db508d97d7b560ccfe85 (patch) | |
| tree | a268fb727adda47f9b3fd729fa3ba5b2f2fe30d7 /src/nvim/eval.c | |
| parent | d6f658e38fc6a44dfc43af9eef3ae09452a8c2a5 (diff) | |
| download | rneovim-b3e56957f8e9468497e5db508d97d7b560ccfe85.tar.gz rneovim-b3e56957f8e9468497e5db508d97d7b560ccfe85.tar.bz2 rneovim-b3e56957f8e9468497e5db508d97d7b560ccfe85.zip | |
vim-patch:8.1.0460: assert_fails() message argument #11051
Problem: assert_fails() does not take a message argument
Solution: Add the argument.
https://github.com/vim/vim/commit/1307d1c003b01b4f67524c95feb07c3d91c7c428
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 248edfc9cc..7d45787fae 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -7076,7 +7076,7 @@ static void f_assert_exception(typval_T *argvars, typval_T *rettv, FunPtr fptr) rettv->vval.v_number = assert_exception(argvars); } -/// "assert_fails(cmd [, error])" function +/// "assert_fails(cmd [, error [, msg]])" function static void f_assert_fails(typval_T *argvars, typval_T *rettv, FunPtr fptr) { const char *const cmd = tv_get_string_chk(&argvars[0]); @@ -7094,7 +7094,14 @@ static void f_assert_fails(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (!called_emsg) { prepare_assert_error(&ga); ga_concat(&ga, (const char_u *)"command did not fail: "); - ga_concat(&ga, (const char_u *)cmd); + if (argvars[1].v_type != VAR_UNKNOWN + && argvars[2].v_type != VAR_UNKNOWN) { + char *const tofree = encode_tv2echo(&argvars[2], NULL); + ga_concat(&ga, (char_u *)tofree); + xfree(tofree); + } else { + ga_concat(&ga, (const char_u *)cmd); + } assert_error(&ga); ga_clear(&ga); ret = 1; |