Mercurial > vim
comparison src/textprop.c @ 26877:06a137af96f8 v8.2.3967
patch 8.2.3967: error messages are spread out
Commit: https://github.com/vim/vim/commit/460ae5dfca31fa627531c263184849976755cf6b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 1 14:19:49 2022 +0000
patch 8.2.3967: error messages are spread out
Problem: Error messages are spread out.
Solution: Move more errors to errors.h.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 01 Jan 2022 15:30:05 +0100 |
parents | bce848ec8b1b |
children | d02d40f0261c |
comparison
equal
deleted
inserted
replaced
26876:601a973ac16c | 26877:06a137af96f8 |
---|---|
130 { | 130 { |
131 dictitem_T *di; | 131 dictitem_T *di; |
132 | 132 |
133 if (arg->v_type != VAR_DICT) | 133 if (arg->v_type != VAR_DICT) |
134 { | 134 { |
135 emsg(_(e_dictreq)); | 135 emsg(_(e_dictionary_required)); |
136 return FAIL; | 136 return FAIL; |
137 } | 137 } |
138 if (arg->vval.v_dict == NULL) | 138 if (arg->vval.v_dict == NULL) |
139 return OK; // NULL dict is like an empty dict | 139 return OK; // NULL dict is like an empty dict |
140 di = dict_find(arg->vval.v_dict, (char_u *)"bufnr", -1); | 140 di = dict_find(arg->vval.v_dict, (char_u *)"bufnr", -1); |
170 semsg(_(e_invalid_column_number_nr), (long)start_col); | 170 semsg(_(e_invalid_column_number_nr), (long)start_col); |
171 return; | 171 return; |
172 } | 172 } |
173 if (argvars[2].v_type != VAR_DICT) | 173 if (argvars[2].v_type != VAR_DICT) |
174 { | 174 { |
175 emsg(_(e_dictreq)); | 175 emsg(_(e_dictionary_required)); |
176 return; | 176 return; |
177 } | 177 } |
178 | 178 |
179 prop_add_common(start_lnum, start_col, argvars[2].vval.v_dict, | 179 prop_add_common(start_lnum, start_col, argvars[2].vval.v_dict, |
180 curbuf, &argvars[2]); | 180 curbuf, &argvars[2]); |
326 || check_for_list_arg(argvars, 1) == FAIL) | 326 || check_for_list_arg(argvars, 1) == FAIL) |
327 return; | 327 return; |
328 | 328 |
329 if (argvars[1].vval.v_list == NULL) | 329 if (argvars[1].vval.v_list == NULL) |
330 { | 330 { |
331 emsg(_(e_listreq)); | 331 emsg(_(e_list_required)); |
332 return; | 332 return; |
333 } | 333 } |
334 | 334 |
335 dict = argvars[0].vval.v_dict; | 335 dict = argvars[0].vval.v_dict; |
336 if (dict == NULL || dict_find(dict, (char_u *)"type", -1) == NULL) | 336 if (dict == NULL || dict_find(dict, (char_u *)"type", -1) == NULL) |
348 | 348 |
349 FOR_ALL_LIST_ITEMS(argvars[1].vval.v_list, li) | 349 FOR_ALL_LIST_ITEMS(argvars[1].vval.v_list, li) |
350 { | 350 { |
351 if (li->li_tv.v_type != VAR_LIST || li->li_tv.vval.v_list == NULL) | 351 if (li->li_tv.v_type != VAR_LIST || li->li_tv.vval.v_list == NULL) |
352 { | 352 { |
353 emsg(_(e_listreq)); | 353 emsg(_(e_list_required)); |
354 return; | 354 return; |
355 } | 355 } |
356 | 356 |
357 pos_list = li->li_tv.vval.v_list; | 357 pos_list = li->li_tv.vval.v_list; |
358 start_lnum = list_find_nr(pos_list, 0L, &error); | 358 start_lnum = list_find_nr(pos_list, 0L, &error); |
730 || check_for_opt_string_arg(argvars, 1) == FAIL)) | 730 || check_for_opt_string_arg(argvars, 1) == FAIL)) |
731 return; | 731 return; |
732 | 732 |
733 if (argvars[0].v_type != VAR_DICT || argvars[0].vval.v_dict == NULL) | 733 if (argvars[0].v_type != VAR_DICT || argvars[0].vval.v_dict == NULL) |
734 { | 734 { |
735 emsg(_(e_dictreq)); | 735 emsg(_(e_dictionary_required)); |
736 return; | 736 return; |
737 } | 737 } |
738 dict = argvars[0].vval.v_dict; | 738 dict = argvars[0].vval.v_dict; |
739 | 739 |
740 if (get_bufnr_from_arg(&argvars[0], &buf) == FAIL) | 740 if (get_bufnr_from_arg(&argvars[0], &buf) == FAIL) |
982 i = 0; | 982 i = 0; |
983 FOR_ALL_LIST_ITEMS(l, li) | 983 FOR_ALL_LIST_ITEMS(l, li) |
984 { | 984 { |
985 if (li->li_tv.v_type != VAR_STRING) | 985 if (li->li_tv.v_type != VAR_STRING) |
986 { | 986 { |
987 emsg(_(e_stringreq)); | 987 emsg(_(e_string_required)); |
988 goto errret; | 988 goto errret; |
989 } | 989 } |
990 name = li->li_tv.vval.v_string; | 990 name = li->li_tv.vval.v_string; |
991 if (name == NULL) | 991 if (name == NULL) |
992 goto errret; | 992 goto errret; |
1077 { | 1077 { |
1078 dict_T *d; | 1078 dict_T *d; |
1079 | 1079 |
1080 if (argvars[1].v_type != VAR_DICT) | 1080 if (argvars[1].v_type != VAR_DICT) |
1081 { | 1081 { |
1082 emsg(_(e_dictreq)); | 1082 emsg(_(e_dictionary_required)); |
1083 return; | 1083 return; |
1084 } | 1084 } |
1085 d = argvars[1].vval.v_dict; | 1085 d = argvars[1].vval.v_dict; |
1086 | 1086 |
1087 if (get_bufnr_from_arg(&argvars[1], &buf) == FAIL) | 1087 if (get_bufnr_from_arg(&argvars[1], &buf) == FAIL) |
1089 | 1089 |
1090 if (d != NULL && (di = dict_find(d, (char_u *)"end_lnum", -1)) != NULL) | 1090 if (d != NULL && (di = dict_find(d, (char_u *)"end_lnum", -1)) != NULL) |
1091 { | 1091 { |
1092 if (di->di_tv.v_type != VAR_NUMBER) | 1092 if (di->di_tv.v_type != VAR_NUMBER) |
1093 { | 1093 { |
1094 emsg(_(e_numberreq)); | 1094 emsg(_(e_number_required)); |
1095 return; | 1095 return; |
1096 } | 1096 } |
1097 end_lnum = tv_get_number(&di->di_tv); | 1097 end_lnum = tv_get_number(&di->di_tv); |
1098 if (end_lnum < 0) | 1098 if (end_lnum < 0) |
1099 // negative end_lnum is used as an offset from the last buffer | 1099 // negative end_lnum is used as an offset from the last buffer |
1105 } | 1105 } |
1106 if (d != NULL && (di = dict_find(d, (char_u *)"types", -1)) != NULL) | 1106 if (d != NULL && (di = dict_find(d, (char_u *)"types", -1)) != NULL) |
1107 { | 1107 { |
1108 if (di->di_tv.v_type != VAR_LIST) | 1108 if (di->di_tv.v_type != VAR_LIST) |
1109 { | 1109 { |
1110 emsg(_(e_listreq)); | 1110 emsg(_(e_list_required)); |
1111 return; | 1111 return; |
1112 } | 1112 } |
1113 | 1113 |
1114 l = di->di_tv.vval.v_list; | 1114 l = di->di_tv.vval.v_list; |
1115 if (l != NULL && list_len(l) > 0) | 1115 if (l != NULL && list_len(l) > 0) |
1121 } | 1121 } |
1122 if (d != NULL && (di = dict_find(d, (char_u *)"ids", -1)) != NULL) | 1122 if (d != NULL && (di = dict_find(d, (char_u *)"ids", -1)) != NULL) |
1123 { | 1123 { |
1124 if (di->di_tv.v_type != VAR_LIST) | 1124 if (di->di_tv.v_type != VAR_LIST) |
1125 { | 1125 { |
1126 emsg(_(e_listreq)); | 1126 emsg(_(e_list_required)); |
1127 goto errret; | 1127 goto errret; |
1128 } | 1128 } |
1129 | 1129 |
1130 l = di->di_tv.vval.v_list; | 1130 l = di->di_tv.vval.v_list; |
1131 if (l != NULL && list_len(l) > 0) | 1131 if (l != NULL && list_len(l) > 0) |