mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 23:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1032

Browse Source 
Problem:    message from assert_false() does not look nice.
Solution:   Handle missing sourcing_name. Use right number of spaces. (Watiko)
            Don't use line number if it's zero.

cbfe32953a
This commit is contained in:
watiko
2015-12-17 17:08:23 +09:00
parent 2586459118
commit 3a6cef9ee6
2 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/eval.c
View File

@@ -7992,10 +7992,19 @@ static void prepare_assert_error(garray_T *gap)
char buf[NUMBUFLEN];
ga_init(gap, 1, 100);
ga_concat(gap, sourcing_name);
vim_snprintf(buf, ARRAY_SIZE(buf), " line %ld", (long)sourcing_lnum);
ga_concat(gap, (char_u *)buf);
ga_concat(gap, (char_u *)": ");
if (sourcing_name != NULL) {
ga_concat(gap, sourcing_name);
if (sourcing_lnum > 0) {
ga_concat(gap, (char_u *)" ");
}
}
if (sourcing_lnum > 0) {
vim_snprintf(buf, ARRAY_SIZE(buf), "line %ld", (long)sourcing_lnum);
ga_concat(gap, (char_u *)buf);
}
if (sourcing_name != NULL || sourcing_lnum > 0) {
ga_concat(gap, (char_u *)": ");
}
}
// Fill "gap" with information about an assert error.
@@ -8062,7 +8071,7 @@ static void assert_bool(typval_T *argvars, bool isTrue)
(get_tv_number_chk(&argvars[0], &error) == 0) == isTrue || error) {
prepare_assert_error(&ga);
fill_assert_error(&ga, &argvars[1],
(char_u *)(isTrue ? "True " : "False "),
(char_u *)(isTrue ? "True" : "False"),
NULL, &argvars[0]);
assert_error(&ga);
ga_clear(&ga);