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

ex_getln: Make error messages look better

Browse Source
This commit is contained in:
ZyX
2017-08-14 01:56:48 +03:00
parent 5c60cd2abb
commit 19a28352a9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/ex_getln.c
View File

@@ -2420,7 +2420,7 @@ static bool color_cmdline(const CmdlineInfo *const colored_ccline,
} else if (colored_ccline->cmdfirstc == ':') { } else if (colored_ccline->cmdfirstc == ':') {
try_enter(&tstate); try_enter(&tstate);
err_errmsg = N_( err_errmsg = N_(
"E5408: Unable to get Nvim_color_cmdline callback from g:: %s"); "E5408: Unable to get g:Nvim_color_cmdline callback: %s");
dgc_ret = tv_dict_get_callback(&globvardict, S_LEN("Nvim_color_cmdline"), dgc_ret = tv_dict_get_callback(&globvardict, S_LEN("Nvim_color_cmdline"),
&color_cb); &color_cb);
tl_ret = try_leave(&tstate, &err); tl_ret = try_leave(&tstate, &err);
@@ -2428,7 +2428,7 @@ static bool color_cmdline(const CmdlineInfo *const colored_ccline,
} else if (colored_ccline->cmdfirstc == '=') { } else if (colored_ccline->cmdfirstc == '=') {
try_enter(&tstate); try_enter(&tstate);
err_errmsg = N_( err_errmsg = N_(
"E5409: Unable to get Nvim_color_expr callback from g:: %s"); "E5409: Unable to get g:Nvim_color_expr callback: %s");
dgc_ret = tv_dict_get_callback(&globvardict, S_LEN("Nvim_color_expr"), dgc_ret = tv_dict_get_callback(&globvardict, S_LEN("Nvim_color_expr"),
&color_cb); &color_cb);
tl_ret = try_leave(&tstate, &err); tl_ret = try_leave(&tstate, &err);

12
test/functional/ui/cmdline_highlight_spec.lua
View File

@@ -854,9 +854,9 @@ describe('Ex commands coloring support', function()
{EOB:~ }| {EOB:~ }|
{EOB:~ }| {EOB:~ }|
: | : |
{ERR:E5408: Unable to get Nvim_color_cmdline }| {ERR:E5408: Unable to get g:Nvim_color_cmdlin}|
{ERR:callback from g:: Vim:E6000: Argument is}| {ERR:e callback: Vim:E6000: Argument is not a}|
{ERR: not a function or function name} | {ERR: function or function name} |
:#^ | :#^ |
]]) ]])
end) end)
@@ -884,9 +884,9 @@ describe('Expressions coloring support', function()
{EOB:~ }| {EOB:~ }|
{EOB:~ }| {EOB:~ }|
= | = |
{ERR:E5409: Unable to get Nvim_color_expr cal}| {ERR:E5409: Unable to get g:Nvim_color_expr c}|
{ERR:lback from g:: Vim:E6000: Argument is no}| {ERR:allback: Vim:E6000: Argument is not a fu}|
{ERR:t a function or function name} | {ERR:nction or function name} |
=1^ | =1^ |
]]) ]])
end) end)