aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.0.0254: error message of assert functions is sometimes incomplete

Browse Source 
Problem:    When using an assert function one can either specify a message or
            get a message about what failed, not both.
Solution:   Concatenate the error with the message.
This commit is contained in:
Bram Moolenaar
2017-01-28 18:08:12 +01:00
parent 36ae89c550
commit c7b831ca15
3 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/eval.c
View File

@@ -9240,35 +9240,34 @@ fill_assert_error(
if (opt_msg_tv->v_type != VAR_UNKNOWN) if (opt_msg_tv->v_type != VAR_UNKNOWN)
{ {
ga_concat(gap, tv2string(opt_msg_tv, &tofree, numbuf, 0)); ga_concat(gap, echo_string(opt_msg_tv, &tofree, numbuf, 0));
vim_free(tofree);
ga_concat(gap, (char_u *)": ");
}
if (atype == ASSERT_MATCH || atype == ASSERT_NOTMATCH)
ga_concat(gap, (char_u *)"Pattern ");
else if (atype == ASSERT_NOTEQUAL)
ga_concat(gap, (char_u *)"Expected not equal to ");
else
ga_concat(gap, (char_u *)"Expected ");
if (exp_str == NULL)
{
ga_concat_esc(gap, tv2string(exp_tv, &tofree, numbuf, 0));
vim_free(tofree); vim_free(tofree);
} }
else else
ga_concat_esc(gap, exp_str);
if (atype != ASSERT_NOTEQUAL)
{ {
if (atype == ASSERT_MATCH || atype == ASSERT_NOTMATCH) if (atype == ASSERT_MATCH)
ga_concat(gap, (char_u *)"Pattern "); ga_concat(gap, (char_u *)" does not match ");
else if (atype == ASSERT_NOTEQUAL) else if (atype == ASSERT_NOTMATCH)
ga_concat(gap, (char_u *)"Expected not equal to "); ga_concat(gap, (char_u *)" does match ");
else else
ga_concat(gap, (char_u *)"Expected "); ga_concat(gap, (char_u *)" but got ");
if (exp_str == NULL) ga_concat_esc(gap, tv2string(got_tv, &tofree, numbuf, 0));
{ vim_free(tofree);
ga_concat_esc(gap, tv2string(exp_tv, &tofree, numbuf, 0));
vim_free(tofree);
}
else
ga_concat_esc(gap, exp_str);
if (atype != ASSERT_NOTEQUAL)
{
if (atype == ASSERT_MATCH)
ga_concat(gap, (char_u *)" does not match ");
else if (atype == ASSERT_NOTMATCH)
ga_concat(gap, (char_u *)" does match ");
else
ga_concat(gap, (char_u *)" but got ");
ga_concat_esc(gap, tv2string(got_tv, &tofree, numbuf, 0));
vim_free(tofree);
}
} }
} }

6
src/testdir/test_assert.vim
View File

@@ -121,6 +121,12 @@ func Test_assert_inrange()
call assert_fails('call assert_inrange(1, 1)', 'E119:') call assert_fails('call assert_inrange(1, 1)', 'E119:')
endfunc endfunc
func Test_assert_with_msg()
call assert_equal('foo', 'bar', 'testing')
call assert_match("testing: Expected 'foo' but got 'bar'", v:errors[0])
call remove(v:errors, 0)
endfunc
func Test_user_is_happy() func Test_user_is_happy()
smile smile
sleep 300m sleep 300m

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
254,
/**/ /**/
253, 253,
/**/ /**/