aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3972: error messages are spread out

Browse Source 
Problem:    Error messages are spread out.
Solution:   Move the last errors from globals.h to errors.h.
This commit is contained in:
Bram Moolenaar 2022-01-01 16:21:00 +00:00
parent 0699b040e6
commit 3a846e6bca
15 changed files with 61 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/errors.h
View File

@ -528,7 +528,15 @@ EXTERN char e_cannot_allocate_color_str[]
EXTERN char e_couldnt_read_in_sign_data[] EXTERN char e_couldnt_read_in_sign_data[]
INIT(= N_("E255: Couldn't read in sign data")); INIT(= N_("E255: Couldn't read in sign data"));
#endif #endif
#ifdef FEAT_EVAL
EXTERN char e_no_white_space_allowed_before_parenthesis[]
INIT(= N_("E274: No white space allowed before parenthesis"));
#endif
#ifdef FEAT_MENU
EXTERN char e_menu_only_exists_in_another_mode[]
INIT(= N_("E328: Menu only exists in another mode"));
#endif
EXTERN char e_internal_error_lalloc_zero[] EXTERN char e_internal_error_lalloc_zero[]
INIT(= N_("E341: Internal error: lalloc(0, )")); INIT(= N_("E341: Internal error: lalloc(0, )"));
EXTERN char e_out_of_memory_allocating_nr_bytes[] EXTERN char e_out_of_memory_allocating_nr_bytes[]
@ -668,6 +676,16 @@ EXTERN char e_not_allowed_to_change_text_or_change_window[]
EXTERN char e_not_allowed_to_change_text_here[] EXTERN char e_not_allowed_to_change_text_here[]
INIT(= N_("E578: Not allowed to change text here")); INIT(= N_("E578: Not allowed to change text here"));
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
EXTERN char e_endif_without_if[]
INIT(= N_("E580: :endif without :if"));
EXTERN char e_else_without_if[]
INIT(= N_("E581: :else without :if"));
EXTERN char e_elseif_without_if[]
INIT(= N_("E582: :elseif without :if"));
EXTERN char e_continue_without_while_or_for[]
INIT(= N_("E586: :continue without :while or :for"));
EXTERN char e_break_without_while_or_for[]
INIT(= N_("E587: :break without :while or :for"));
EXTERN char e_endwhile_without_while[] EXTERN char e_endwhile_without_while[]
INIT(= N_("E588: :endwhile without :while")); INIT(= N_("E588: :endwhile without :while"));
EXTERN char e_endfor_without_for[] EXTERN char e_endfor_without_for[]
@ -716,11 +734,17 @@ EXTERN char e_list_index_out_of_range_nr[]
EXTERN char e_internal_error_str[] EXTERN char e_internal_error_str[]
INIT(= N_("E685: Internal error: %s")); INIT(= N_("E685: Internal error: %s"));
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
EXTERN char e_argument_of_str_must_be_list[]
INIT(= N_("E686: Argument of %s must be a List"));
EXTERN char e_missing_in_after_for[]
INIT(= N_("E690: Missing \"in\" after :for"));
// E693 unused
EXTERN char e_cannot_index_a_funcref[] EXTERN char e_cannot_index_a_funcref[]
INIT(= N_("E695: Cannot index a Funcref")); INIT(= N_("E695: Cannot index a Funcref"));
EXTERN char e_missing_end_of_list_rsb_str[] EXTERN char e_missing_end_of_list_rsb_str[]
INIT(= N_("E697: Missing end of List ']': %s")); INIT(= N_("E697: Missing end of List ']': %s"));
// E706 unused
EXTERN char e_list_value_has_more_items_than_targets[] EXTERN char e_list_value_has_more_items_than_targets[]
INIT(= N_("E710: List value has more items than targets")); INIT(= N_("E710: List value has more items than targets"));
EXTERN char e_list_value_does_not_have_enough_items[] EXTERN char e_list_value_does_not_have_enough_items[]
@ -864,6 +888,10 @@ EXTERN char e_attempt_to_delete_buffer_that_is_in_use_str[]
INIT(= N_("E937: Attempt to delete a buffer that is in use: %s")); INIT(= N_("E937: Attempt to delete a buffer that is in use: %s"));
EXTERN char e_positive_count_required[] EXTERN char e_positive_count_required[]
INIT(= N_("E939: Positive count required")); INIT(= N_("E939: Positive count required"));
#ifdef FEAT_EVAL
EXTERN char e_cannot_lock_or_unlock_variable_str[]
INIT(= N_("E940: Cannot lock or unlock variable %s"));
#endif
#ifdef FEAT_TERMINAL #ifdef FEAT_TERMINAL
EXTERN char e_job_still_running[] EXTERN char e_job_still_running[]
INIT(= N_("E948: Job still running")); INIT(= N_("E948: Job still running"));
@ -874,6 +902,8 @@ EXTERN char e_file_changed_while_writing[]
INIT(= N_("E949: File changed while writing")); INIT(= N_("E949: File changed while writing"));
EXTERN char e_autocommand_caused_recursive_behavior[] EXTERN char e_autocommand_caused_recursive_behavior[]
INIT(= N_("E952: Autocommand caused recursive behavior")); INIT(= N_("E952: Autocommand caused recursive behavior"));
EXTERN char e_invalid_window_number[]
INIT(= N_("E957: Invalid window number"));
EXTERN char_u e_invalid_column_number_nr[] EXTERN char_u e_invalid_column_number_nr[]
INIT(= N_("E964: Invalid column number: %ld")); INIT(= N_("E964: Invalid column number: %ld"));
EXTERN char_u e_invalid_line_number_nr[] EXTERN char_u e_invalid_line_number_nr[]

8
src/eval.c
View File

@ -1632,7 +1632,7 @@ eval_for_line(
if (in_vim9script() && *expr == ':' && expr != var_list_end) if (in_vim9script() && *expr == ':' && expr != var_list_end)
semsg(_(e_no_white_space_allowed_before_colon_str), expr); semsg(_(e_no_white_space_allowed_before_colon_str), expr);
else else
emsg(_(e_missing_in)); emsg(_(e_missing_in_after_for));
return fi; return fi;
} }
@ -3888,7 +3888,7 @@ eval_lambda(
if (verbose) if (verbose)
{ {
if (*skipwhite(*arg) == '(') if (*skipwhite(*arg) == '(')
emsg(_(e_nowhitespace)); emsg(_(e_no_white_space_allowed_before_parenthesis));
else else
semsg(_(e_missing_parenthesis_str), "lambda"); semsg(_(e_missing_parenthesis_str), "lambda");
} }
@ -3951,7 +3951,7 @@ eval_method(
else if (VIM_ISWHITE((*arg)[-1])) else if (VIM_ISWHITE((*arg)[-1]))
{ {
if (verbose) if (verbose)
emsg(_(e_nowhitespace)); emsg(_(e_no_white_space_allowed_before_parenthesis));
ret = FAIL; ret = FAIL;
} }
else else
@ -5948,7 +5948,7 @@ handle_subscript(
{ {
if (VIM_ISWHITE(**arg)) if (VIM_ISWHITE(**arg))
{ {
emsg(_(e_nowhitespace)); emsg(_(e_no_white_space_allowed_before_parenthesis));
ret = FAIL; ret = FAIL;
} }
else if ((**arg == '{' && !in_vim9script()) || **arg == '(') else if ((**arg == '{' && !in_vim9script()) || **arg == '(')

4
src/evalfunc.c
View File

@ -3071,7 +3071,7 @@ get_optional_window(typval_T *argvars, int idx)
win = find_win_by_nr_or_id(&argvars[idx]); win = find_win_by_nr_or_id(&argvars[idx]);
if (win == NULL) if (win == NULL)
{ {
emsg(_(e_invalwindow)); emsg(_(e_invalid_window_number));
return NULL; return NULL;
} }
} }
@ -6570,7 +6570,7 @@ f_inputlist(typval_T *argvars, typval_T *rettv)
if (argvars[0].v_type != VAR_LIST || argvars[0].vval.v_list == NULL) if (argvars[0].v_type != VAR_LIST || argvars[0].vval.v_list == NULL)
{ {
semsg(_(e_listarg), "inputlist()"); semsg(_(e_argument_of_str_must_be_list), "inputlist()");
return; return;
} }

4
src/evalvars.c
View File

@ -1889,7 +1889,7 @@ do_lock_var(
*name_end = NUL; *name_end = NUL;
if (*lp->ll_name == '$') if (*lp->ll_name == '$')
{ {
semsg(_(e_lock_unlock), lp->ll_name); semsg(_(e_cannot_lock_or_unlock_variable_str), lp->ll_name);
ret = FAIL; ret = FAIL;
} }
else else
@ -1909,7 +1909,7 @@ do_lock_var(
{ {
// For historic reasons this error is not given for a list or // For historic reasons this error is not given for a list or
// dict. E.g., the b: dict could be locked/unlocked. // dict. E.g., the b: dict could be locked/unlocked.
semsg(_(e_lock_unlock), lp->ll_name); semsg(_(e_cannot_lock_or_unlock_variable_str), lp->ll_name);
ret = FAIL; ret = FAIL;
} }
else else

2
src/evalwindow.c
View File

@ -916,7 +916,7 @@ f_win_splitmove(typval_T *argvars, typval_T *rettv)
|| !win_valid(wp) || !win_valid(targetwin) || !win_valid(wp) || !win_valid(targetwin)
|| win_valid_popup(wp) || win_valid_popup(targetwin)) || win_valid_popup(wp) || win_valid_popup(targetwin))
{ {
emsg(_(e_invalwindow)); emsg(_(e_invalid_window_number));
rettv->vval.v_number = -1; rettv->vval.v_number = -1;
return; return;
} }

4
src/ex_eval.c
View File

@ -1316,7 +1316,7 @@ ex_continue(exarg_T *eap)
cstack_T *cstack = eap->cstack; cstack_T *cstack = eap->cstack;
if (cstack->cs_looplevel <= 0 || cstack->cs_idx < 0) if (cstack->cs_looplevel <= 0 || cstack->cs_idx < 0)
eap->errmsg = _(e_continue); eap->errmsg = _(e_continue_without_while_or_for);
else else
{ {
// Try to find the matching ":while". This might stop at a try // Try to find the matching ":while". This might stop at a try
@ -1354,7 +1354,7 @@ ex_break(exarg_T *eap)
cstack_T *cstack = eap->cstack; cstack_T *cstack = eap->cstack;
if (cstack->cs_looplevel <= 0 || cstack->cs_idx < 0) if (cstack->cs_looplevel <= 0 || cstack->cs_idx < 0)
eap->errmsg = _(e_break); eap->errmsg = _(e_break_without_while_or_for);
else else
{ {
// Inactivate conditionals until the matching ":while" or a try // Inactivate conditionals until the matching ":while" or a try

23
src/globals.h
View File

@ -1600,29 +1600,8 @@ EXTERN int netbeansSuppressNoLines INIT(= 0); // skip "No lines in buffer"
#endif #endif
/* /*
* Some error messages that can be shared are included here. * Some messages that can be shared are included here.
* They should be moved to errors.h.
*/ */
#ifdef FEAT_MENU
EXTERN char e_menuothermode[] INIT(= N_("E328: Menu only exists in another mode"));
#endif
EXTERN char e_invalwindow[] INIT(= N_("E957: Invalid window number"));
EXTERN char e_listarg[] INIT(= N_("E686: Argument of %s must be a List"));
#ifdef FEAT_EVAL
EXTERN char e_missing_in[] INIT(= N_("E690: Missing \"in\" after :for"));
EXTERN char e_else_without_if[] INIT(= N_("E581: :else without :if"));
EXTERN char e_elseif_without_if[] INIT(= N_("E582: :elseif without :if"));
EXTERN char e_endif_without_if[] INIT(= N_("E580: :endif without :if"));
EXTERN char e_continue[] INIT(= N_("E586: :continue without :while or :for"));
EXTERN char e_break[] INIT(= N_("E587: :break without :while or :for"));
EXTERN char e_nowhitespace[] INIT(= N_("E274: No white space allowed before parenthesis"));
EXTERN char e_lock_unlock[] INIT(= N_("E940: Cannot lock or unlock variable %s"));
#endif
EXTERN char e_chan_or_job_req[] INIT(= N_("E706: Channel or Job required"));
EXTERN char e_jobreq[] INIT(= N_("E693: Job required"));
EXTERN char top_bot_msg[] INIT(= N_("search hit TOP, continuing at BOTTOM")); EXTERN char top_bot_msg[] INIT(= N_("search hit TOP, continuing at BOTTOM"));
EXTERN char bot_top_msg[] INIT(= N_("search hit BOTTOM, continuing at TOP")); EXTERN char bot_top_msg[] INIT(= N_("search hit BOTTOM, continuing at TOP"));

4
src/list.c
View File

@ -992,7 +992,7 @@ flatten_common(typval_T *argvars, typval_T *rettv, int make_copy)
if (argvars[0].v_type != VAR_LIST) if (argvars[0].v_type != VAR_LIST)
{ {
semsg(_(e_listarg), "flatten()"); semsg(_(e_argument_of_str_must_be_list), "flatten()");
return; return;
} }
@ -2202,7 +2202,7 @@ do_sort_uniq(typval_T *argvars, typval_T *rettv, int sort)
if (argvars[0].v_type != VAR_LIST) if (argvars[0].v_type != VAR_LIST)
{ {
semsg(_(e_listarg), sort ? "sort()" : "uniq()"); semsg(_(e_argument_of_str_must_be_list), sort ? "sort()" : "uniq()");
return; return;
} }

4
src/match.c
View File

@ -949,7 +949,7 @@ matchadd_dict_arg(typval_T *tv, char_u **conceal_char, win_T **win)
*win = find_win_by_nr_or_id(&di->di_tv); *win = find_win_by_nr_or_id(&di->di_tv);
if (*win == NULL) if (*win == NULL)
{ {
emsg(_(e_invalwindow)); emsg(_(e_invalid_window_number));
return FAIL; return FAIL;
} }
} }
@ -1259,7 +1259,7 @@ f_matchaddpos(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
if (argvars[1].v_type != VAR_LIST) if (argvars[1].v_type != VAR_LIST)
{ {
semsg(_(e_listarg), "matchaddpos()"); semsg(_(e_argument_of_str_must_be_list), "matchaddpos()");
return; return;
} }
l = argvars[1].vval.v_list; l = argvars[1].vval.v_list;

4
src/menu.c
View File

@ -959,7 +959,7 @@ remove_menu(
else if (*name != NUL) else if (*name != NUL)
{ {
if (!silent) if (!silent)
emsg(_(e_menuothermode)); emsg(_(e_menu_only_exists_in_another_mode));
return FAIL; return FAIL;
} }
@ -1133,7 +1133,7 @@ show_menus(char_u *path_name, int modes)
} }
else if ((menu->modes & modes) == 0x0) else if ((menu->modes & modes) == 0x0)
{ {
emsg(_(e_menuothermode)); emsg(_(e_menu_only_exists_in_another_mode));
vim_free(path_name); vim_free(path_name);
return FAIL; return FAIL;
} }

2
src/popupmenu.c
View File

@ -1476,7 +1476,7 @@ pum_show_popupmenu(vimmenu_T *menu)
// pum_size being zero. // pum_size being zero.
if (pum_size <= 0) if (pum_size <= 0)
{ {
emsg(e_menuothermode); emsg(e_menu_only_exists_in_another_mode);
return; return;
} }

3
src/search.c
View File

@ -4807,7 +4807,8 @@ do_fuzzymatch(typval_T *argvars, typval_T *rettv, int retmatchpos)
// validate and get the arguments // validate and get the arguments
if (argvars[0].v_type != VAR_LIST || argvars[0].vval.v_list == NULL) if (argvars[0].v_type != VAR_LIST || argvars[0].vval.v_list == NULL)
{ {
semsg(_(e_listarg), retmatchpos ? "matchfuzzypos()" : "matchfuzzy()"); semsg(_(e_argument_of_str_must_be_list),
retmatchpos ? "matchfuzzypos()" : "matchfuzzy()");
return; return;
} }
if (argvars[1].v_type != VAR_STRING if (argvars[1].v_type != VAR_STRING

2
src/version.c
View File

@ -749,6 +749,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 */
/**/
3972,
/**/ /**/
3971, 3971,
/**/ /**/

6
src/vim9cmds.c
View File

@ -796,7 +796,7 @@ compile_for(char_u *arg_start, cctx_T *cctx)
if (*p == ':' && wp != p) if (*p == ':' && wp != p)
semsg(_(e_no_white_space_allowed_before_colon_str), p); semsg(_(e_no_white_space_allowed_before_colon_str), p);
else else
emsg(_(e_missing_in)); emsg(_(e_missing_in_after_for));
return NULL; return NULL;
} }
wp = p + 2; wp = p + 2;
@ -1150,7 +1150,7 @@ compile_continue(char_u *arg, cctx_T *cctx)
{ {
if (scope == NULL) if (scope == NULL)
{ {
emsg(_(e_continue)); emsg(_(e_continue_without_while_or_for));
return NULL; return NULL;
} }
if (scope->se_type == FOR_SCOPE) if (scope->se_type == FOR_SCOPE)
@ -1192,7 +1192,7 @@ compile_break(char_u *arg, cctx_T *cctx)
{ {
if (scope == NULL) if (scope == NULL)
{ {
emsg(_(e_break)); emsg(_(e_break_without_while_or_for));
return NULL; return NULL;
} }
if (scope->se_type == FOR_SCOPE || scope->se_type == WHILE_SCOPE) if (scope->se_type == FOR_SCOPE || scope->se_type == WHILE_SCOPE)

2
src/vim9expr.c
View File

@ -1659,7 +1659,7 @@ compile_subscript(
if (**arg != '(') if (**arg != '(')
{ {
if (*skipwhite(*arg) == '(') if (*skipwhite(*arg) == '(')
emsg(_(e_nowhitespace)); emsg(_(e_no_white_space_allowed_before_parenthesis));
else else
semsg(_(e_missing_parenthesis_str), *arg); semsg(_(e_missing_parenthesis_str), *arg);
return FAIL; return FAIL;