Skip to content

Commit 7707228

Browse files
brammoolbrammool
committed
patch 8.2.1697: inconsistent capitalization of error messages
Problem: Inconsistent capitalization of error messages. Solution: Always start with a capital.
1 parent 2c12f89 commit 7707228

6 files changed

Lines changed: 69 additions & 67 deletions

File tree

‎src/errors.h‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -22,39 +22,39 @@ EXTERN char e_invalid_command[]
2222
EXTERN char e_invalid_command_str[]
2323
INIT(= N_("E476: Invalid command: %s"));
2424
EXTERN char e_cannot_slice_dictionary[]
25-
INIT(= N_("E719: cannot slice a Dictionary"));
25+
INIT(= N_("E719: Cannot slice a Dictionary"));
2626
EXTERN char e_assert_fails_second_arg[]
27-
INIT(= N_("E856: assert_fails() second argument must be a string or a list with one or two strings"));
27+
INIT(= N_("E856: \"assert_fails()\" second argument must be a string or a list with one or two strings"));
2828
EXTERN char e_cannot_index_special_variable[]
2929
INIT(= N_("E909: Cannot index a special variable"));
3030
EXTERN char e_missing_let_str[]
3131
INIT(= N_("E1100: Missing :let: %s"));
3232
EXTERN char e_variable_not_found_str[]
33-
INIT(= N_("E1001: variable not found: %s"));
33+
INIT(= N_("E1001: Variable not found: %s"));
3434
EXTERN char e_syntax_error_at_str[]
3535
INIT(= N_("E1002: Syntax error at %s"));
3636
EXTERN char e_missing_return_value[]
3737
INIT(= N_("E1003: Missing return value"));
3838
EXTERN char e_white_space_required_before_and_after_str[]
39-
INIT(= N_("E1004: white space required before and after '%s'"));
39+
INIT(= N_("E1004: White space required before and after '%s'"));
4040
EXTERN char e_too_many_argument_types[]
4141
INIT(= N_("E1005: Too many argument types"));
4242
EXTERN char e_str_is_used_as_argument[]
4343
INIT(= N_("E1006: %s is used as an argument"));
4444
EXTERN char e_mandatory_argument_after_optional_argument[]
45-
INIT(= N_("E1007: mandatory argument after optional argument"));
45+
INIT(= N_("E1007: Mandatory argument after optional argument"));
4646
EXTERN char e_missing_type[]
4747
INIT(= N_("E1008: Missing <type>"));
4848
EXTERN char e_missing_gt_after_type[]
4949
INIT(= N_("E1009: Missing > after type"));
5050
EXTERN char e_type_not_recognized_str[]
5151
INIT(= N_("E1010: Type not recognized: %s"));
5252
EXTERN char e_name_too_long_str[]
53-
INIT(= N_("E1011: name too long: %s"));
53+
INIT(= N_("E1011: Name too long: %s"));
5454
EXTERN char e_type_mismatch_expected_str_but_got_str[]
5555
INIT(= N_("E1012: Type mismatch; expected %s but got %s"));
5656
EXTERN char e_argument_nr_type_mismatch_expected_str_but_got_str[]
57-
INIT(= N_("E1013: argument %d: type mismatch, expected %s but got %s"));
57+
INIT(= N_("E1013: Argument %d: type mismatch, expected %s but got %s"));
5858
EXTERN char e_invalid_key_str[]
5959
INIT(= N_("E1014: Invalid key: %s"));
6060
EXTERN char e_name_expected[]
@@ -70,33 +70,33 @@ EXTERN char e_cannot_assign_to_constant[]
7070
EXTERN char e_can_only_concatenate_to_string[]
7171
INIT(= N_("E1019: Can only concatenate to string"));
7272
EXTERN char e_cannot_use_operator_on_new_variable[]
73-
INIT(= N_("E1020: cannot use an operator on a new variable: %s"));
73+
INIT(= N_("E1020: Cannot use an operator on a new variable: %s"));
7474
EXTERN char e_const_requires_a_value[]
75-
INIT(= N_("E1021: const requires a value"));
75+
INIT(= N_("E1021: Const requires a value"));
7676
EXTERN char e_type_or_initialization_required[]
77-
INIT(= N_("E1022: type or initialization required"));
77+
INIT(= N_("E1022: Type or initialization required"));
7878
EXTERN char e_using_number_as_bool_nr[]
7979
INIT(= N_("E1023: Using a Number as a Bool: %d"));
8080
EXTERN char e_using_number_as_string[]
8181
INIT(= N_("E1024: Using a Number as a String"));
8282
EXTERN char e_using_rcurly_outside_if_block_scope[]
83-
INIT(= N_("E1025: using } outside of a block scope"));
83+
INIT(= N_("E1025: Using } outside of a block scope"));
8484
EXTERN char e_missing_rcurly[]
8585
INIT(= N_("E1026: Missing }"));
8686
EXTERN char e_missing_return_statement[]
8787
INIT(= N_("E1027: Missing return statement"));
8888
EXTERN char e_compile_def_function_failed[]
89-
INIT(= N_("E1028: compile_def_function failed"));
89+
INIT(= N_("E1028: Compiling :def function failed"));
9090
EXTERN char e_expected_str_but_got_str[]
9191
INIT(= N_("E1029: Expected %s but got %s"));
9292
EXTERN char e_using_string_as_number[]
9393
INIT(= N_("E1030: Using a String as a Number"));
9494
EXTERN char e_cannot_use_void_value[]
9595
INIT(= N_("E1031: Cannot use void value"));
9696
EXTERN char e_missing_catch_or_finally[]
97-
INIT(= N_("E1032: missing :catch or :finally"));
97+
INIT(= N_("E1032: Missing :catch or :finally"));
9898
EXTERN char e_catch_unreachable_after_catch_all[]
99-
INIT(= N_("E1033: catch unreachable after catch-all"));
99+
INIT(= N_("E1033: Catch unreachable after catch-all"));
100100
EXTERN char e_cannot_use_reserved_name[]
101101
INIT(= N_("E1034: Cannot use reserved name %s"));
102102
EXTERN char e_percent_requires_number_arguments[]
@@ -106,33 +106,33 @@ EXTERN char e_char_requires_number_or_float_arguments[]
106106
EXTERN char e_cannot_use_str_with_str[]
107107
INIT(= N_("E1037: Cannot use \"%s\" with %s"));
108108
EXTERN char e_vim9script_can_only_be_used_in_script[]
109-
INIT(= N_("E1038: vim9script can only be used in a script"));
109+
INIT(= N_("E1038: \"vim9script\" can only be used in a script"));
110110
EXTERN char e_vim9script_must_be_first_command_in_script[]
111-
INIT(= N_("E1039: vim9script must be the first command in a script"));
111+
INIT(= N_("E1039: \"vim9script\" must be the first command in a script"));
112112
EXTERN char e_cannot_use_scriptversion_after_vim9script[]
113113
INIT(= N_("E1040: Cannot use :scriptversion after :vim9script"));
114114
EXTERN char e_redefining_script_item_str[]
115115
INIT(= N_("E1041: Redefining script item %s"));
116116
EXTERN char e_export_can_only_be_used_in_vim9script[]
117-
INIT(= N_("E1042: export can only be used in vim9script"));
117+
INIT(= N_("E1042: Export can only be used in vim9script"));
118118
EXTERN char e_invalid_command_after_export[]
119119
INIT(= N_("E1043: Invalid command after :export"));
120120
EXTERN char e_export_with_invalid_argument[]
121-
INIT(= N_("E1044: export with invalid argument"));
121+
INIT(= N_("E1044: Export with invalid argument"));
122122
EXTERN char e_missing_as_after_star[]
123123
INIT(= N_("E1045: Missing \"as\" after *"));
124124
EXTERN char e_missing_comma_in_import[]
125125
INIT(= N_("E1046: Missing comma in import"));
126126
EXTERN char e_syntax_error_in_import[]
127-
INIT(= N_("E1047: syntax error in import"));
127+
INIT(= N_("E1047: Syntax error in import"));
128128
EXTERN char e_item_not_found_in_script_str[]
129129
INIT(= N_("E1048: Item not found in script: %s"));
130130
EXTERN char e_item_not_exported_in_script_str[]
131131
INIT(= N_("E1049: Item not exported in script: %s"));
132132
EXTERN char e_colon_required_before_a_range[]
133133
INIT(= N_("E1050: Colon required before a range"));
134134
EXTERN char e_wrong_argument_type_for_plus[]
135-
INIT(= N_("E1051: wrong argument type for +"));
135+
INIT(= N_("E1051: Wrong argument type for +"));
136136
EXTERN char e_cannot_declare_an_option[]
137137
INIT(= N_("E1052: Cannot declare an option: %s"));
138138
EXTERN char e_could_not_import_str[]
@@ -142,21 +142,21 @@ EXTERN char e_variable_already_declared_in_script[]
142142
EXTERN char e_missing_name_after_dots[]
143143
INIT(= N_("E1055: Missing name after ..."));
144144
EXTERN char e_expected_type_str[]
145-
INIT(= N_("E1056: expected a type: %s"));
145+
INIT(= N_("E1056: Expected a type: %s"));
146146
EXTERN char e_missing_enddef[]
147147
INIT(= N_("E1057: Missing :enddef"));
148148
EXTERN char e_function_nesting_too_deep[]
149-
INIT(= N_("E1058: function nesting too deep"));
149+
INIT(= N_("E1058: Function nesting too deep"));
150150
EXTERN char e_no_white_space_allowed_before_colon_str[]
151151
INIT(= N_("E1059: No white space allowed before colon: %s"));
152152
EXTERN char e_expected_dot_after_name_str[]
153-
INIT(= N_("E1060: expected dot after name: %s"));
153+
INIT(= N_("E1060: Expected dot after name: %s"));
154154
EXTERN char e_cannot_find_function_str[]
155155
INIT(= N_("E1061: Cannot find function %s"));
156156
EXTERN char e_cannot_index_number[]
157157
INIT(= N_("E1062: Cannot index a Number"));
158158
EXTERN char e_type_mismatch_for_v_variable[]
159-
INIT(= N_("E1063: type mismatch for v: variable"));
159+
INIT(= N_("E1063: Type mismatch for v: variable"));
160160
// E1064 unused
161161
// E1065 unused
162162
EXTERN char e_cannot_declare_a_register_str[]
@@ -166,17 +166,17 @@ EXTERN char e_separator_mismatch_str[]
166166
EXTERN char e_no_white_space_allowed_before_str[]
167167
INIT(= N_("E1068: No white space allowed before '%s'"));
168168
EXTERN char e_white_space_required_after_str[]
169-
INIT(= N_("E1069: white space required after '%s'"));
169+
INIT(= N_("E1069: White space required after '%s'"));
170170
EXTERN char e_missing_from[]
171171
INIT(= N_("E1070: Missing \"from\""));
172172
EXTERN char e_invalid_string_after_from[]
173173
INIT(= N_("E1071: Invalid string after \"from\""));
174174
EXTERN char e_cannot_compare_str_with_str[]
175175
INIT(= N_("E1072: Cannot compare %s with %s"));
176176
EXTERN char e_name_already_defined_str[]
177-
INIT(= N_("E1073: name already defined: %s"));
177+
INIT(= N_("E1073: Name already defined: %s"));
178178
EXTERN char e_no_white_space_allowed_after_dot[]
179-
INIT(= N_("E1074: no white space allowed after dot"));
179+
INIT(= N_("E1074: No white space allowed after dot"));
180180
EXTERN char e_namespace_not_supported_str[]
181181
INIT(= N_("E1075: Namespace not supported: %s"));
182182
EXTERN char e_this_vim_is_not_compiled_with_float_support[]
@@ -191,18 +191,18 @@ EXTERN char e_cannot_unlet_str[]
191191
EXTERN char e_cannot_use_namespaced_variable[]
192192
INIT(= N_("E1082: Cannot use a namespaced variable: %s"));
193193
EXTERN char e_missing_backtick[]
194-
INIT(= N_("E1083: missing backtick"));
194+
INIT(= N_("E1083: Missing backtick"));
195195
EXTERN char e_cannot_delete_vim9_script_function_str[]
196196
INIT(= N_("E1084: Cannot delete Vim9 script function %s"));
197197
EXTERN char e_not_callable_type_str[]
198198
INIT(= N_("E1085: Not a callable type: %s"));
199199
EXTERN char e_cannot_use_function_inside_def[]
200200
INIT(= N_("E1086: Cannot use :function inside :def"));
201201
EXTERN char e_cannot_use_index_when_declaring_variable[]
202-
INIT(= N_("E1087: cannot use an index when declaring a variable"));
202+
INIT(= N_("E1087: Cannot use an index when declaring a variable"));
203203
// E1088 unused
204204
EXTERN char e_unknown_variable_str[]
205-
INIT(= N_("E1089: unknown variable: %s"));
205+
INIT(= N_("E1089: Unknown variable: %s"));
206206
EXTERN char e_cannot_assign_to_argument[]
207207
INIT(= N_("E1090: Cannot assign to argument %s"));
208208
EXTERN char e_function_is_not_compiled_str[]
@@ -212,28 +212,28 @@ EXTERN char e_cannot_use_list_for_declaration[]
212212
EXTERN char e_expected_nr_items_but_got_nr[]
213213
INIT(= N_("E1093: Expected %d items but got %d"));
214214
EXTERN char e_import_can_only_be_used_in_script[]
215-
INIT(= N_("E1094: import can only be used in a script"));
215+
INIT(= N_("E1094: Import can only be used in a script"));
216216
EXTERN char e_unreachable_code_after_return[]
217217
INIT(= N_("E1095: Unreachable code after :return"));
218218
EXTERN char e_returning_value_in_function_without_return_type[]
219219
INIT(= N_("E1096: Returning a value in a function without a return type"));
220220
EXTERN char e_line_incomplete[]
221-
INIT(= N_("E1097: line incomplete"));
221+
INIT(= N_("E1097: Line incomplete"));
222222
// E1098 unused
223223
EXTERN char e_unknown_error_while_executing_str[]
224224
INIT(= N_("E1099: Unknown error while executing %s"));
225225
EXTERN char e_cannot_declare_script_variable_in_function[]
226226
INIT(= N_("E1101: Cannot declare a script variable in a function: %s"));
227227
EXTERN char e_lambda_function_not_found_str[]
228-
INIT(= N_("E1102: lambda function not found: %s"));
228+
INIT(= N_("E1102: Lambda function not found: %s"));
229229
EXTERN char e_dictionary_not_set[]
230230
INIT(= N_("E1103: Dictionary not set"));
231231
EXTERN char e_missing_gt[]
232232
INIT(= N_("E1104: Missing >"));
233233
EXTERN char e_cannot_convert_str_to_string[]
234234
INIT(= N_("E1105: Cannot convert %s to string"));
235235
EXTERN char e_one_argument_too_many[]
236-
INIT(= N_("E1106: one argument too many"));
236+
INIT(= N_("E1106: One argument too many"));
237237
EXTERN char e_nr_arguments_too_many[]
238238
INIT(= N_("E1106: %d arguments too many"));
239239
EXTERN char e_string_list_dict_or_blob_required[]
@@ -253,9 +253,9 @@ EXTERN char e_overlapping_ranges_for_nr[]
253253
EXTERN char e_only_values_of_0x100_and_higher_supported[]
254254
INIT(= N_("E1114: Only values of 0x100 and higher supported"));
255255
EXTERN char e_assert_fails_fourth_argument[]
256-
INIT(= N_("E1115: assert_fails() fourth argument must be a number"));
256+
INIT(= N_("E1115: \"assert_fails()\" fourth argument must be a number"));
257257
EXTERN char e_assert_fails_fifth_argument[]
258-
INIT(= N_("E1116: assert_fails() fifth argument must be a string"));
258+
INIT(= N_("E1116: \"assert_fails()\" fifth argument must be a string"));
259259
EXTERN char e_cannot_use_bang_with_nested_def[]
260260
INIT(= N_("E1117: Cannot use ! with nested :def"));
261261
EXTERN char e_cannot_change_list[]

‎src/testdir/test_assert.vim‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,35 +254,35 @@ func Test_assert_fail_fails()
254254
catch
255255
let exp = v:exception
256256
endtry
257-
call assert_match("E856: assert_fails() second argument", exp)
257+
call assert_match("E856: \"assert_fails()\" second argument", exp)
258258

259259
try
260260
call assert_equal(1, assert_fails('xxx', ['1', '2', '3']))
261261
catch
262262
let exp = v:exception
263263
endtry
264-
call assert_match("E856: assert_fails() second argument", exp)
264+
call assert_match("E856: \"assert_fails()\" second argument", exp)
265265

266266
try
267267
call assert_equal(1, assert_fails('xxx', #{one: 1}))
268268
catch
269269
let exp = v:exception
270270
endtry
271-
call assert_match("E856: assert_fails() second argument", exp)
271+
call assert_match("E856: \"assert_fails()\" second argument", exp)
272272

273273
try
274274
call assert_equal(1, assert_fails('xxx', 'E492', '', 'burp'))
275275
catch
276276
let exp = v:exception
277277
endtry
278-
call assert_match("E1115: assert_fails() fourth argument must be a number", exp)
278+
call assert_match("E1115: \"assert_fails()\" fourth argument must be a number", exp)
279279

280280
try
281281
call assert_equal(1, assert_fails('xxx', 'E492', '', 54, 123))
282282
catch
283283
let exp = v:exception
284284
endtry
285-
call assert_match("E1116: assert_fails() fifth argument must be a string", exp)
285+
call assert_match("E1116: \"assert_fails()\" fifth argument must be a string", exp)
286286
endfunc
287287

288288
func Test_assert_fails_in_try_block()

‎src/testdir/test_vim9_expr.vim‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ enddef
143143
func Test_expr1_fails()
144144
call CheckDefFailure(["let x = 1 ? 'one'"], "Missing ':' after '?'", 1)
145145

146-
let msg = "white space required before and after '?'"
146+
let msg = "White space required before and after '?'"
147147
call CheckDefFailure(["let x = 1? 'one' : 'two'"], msg, 1)
148148
call CheckDefFailure(["let x = 1 ?'one' : 'two'"], msg, 1)
149149
call CheckDefFailure(["let x = 1?'one' : 'two'"], msg, 1)
150150

151-
let msg = "white space required before and after ':'"
151+
let msg = "White space required before and after ':'"
152152
call CheckDefFailure(["let x = 1 ? 'one': 'two'"], msg, 1)
153153
call CheckDefFailure(["let x = 1 ? 'one' :'two'"], msg, 1)
154154
call CheckDefFailure(["let x = 1 ? 'one':'two'"], msg, 1)
@@ -276,7 +276,7 @@ def Test_expr2_vimscript()
276276
enddef
277277

278278
func Test_expr2_fails()
279-
let msg = "white space required before and after '||'"
279+
let msg = "White space required before and after '||'"
280280
call CheckDefFailure(["let x = 1||2"], msg, 1)
281281
call CheckDefFailure(["let x = 1 ||2"], msg, 1)
282282
call CheckDefFailure(["let x = 1|| 2"], msg, 1)
@@ -401,7 +401,7 @@ def Test_expr3_vimscript()
401401
enddef
402402

403403
func Test_expr3_fails()
404-
let msg = "white space required before and after '&&'"
404+
let msg = "White space required before and after '&&'"
405405
call CheckDefFailure(["let x = 1&&2"], msg, 1)
406406
call CheckDefFailure(["let x = 1 &&2"], msg, 1)
407407
call CheckDefFailure(["let x = 1&& 2"], msg, 1)
@@ -861,22 +861,22 @@ def Test_expr4_vim9script()
861861
enddef
862862

863863
func Test_expr4_fails()
864-
let msg = "white space required before and after '>'"
864+
let msg = "White space required before and after '>'"
865865
call CheckDefFailure(["let x = 1>2"], msg, 1)
866866
call CheckDefFailure(["let x = 1 >2"], msg, 1)
867867
call CheckDefFailure(["let x = 1> 2"], msg, 1)
868868

869-
let msg = "white space required before and after '=='"
869+
let msg = "White space required before and after '=='"
870870
call CheckDefFailure(["let x = 1==2"], msg, 1)
871871
call CheckDefFailure(["let x = 1 ==2"], msg, 1)
872872
call CheckDefFailure(["let x = 1== 2"], msg, 1)
873873

874-
let msg = "white space required before and after 'is'"
874+
let msg = "White space required before and after 'is'"
875875
call CheckDefFailure(["let x = '1'is'2'"], msg, 1)
876876
call CheckDefFailure(["let x = '1' is'2'"], msg, 1)
877877
call CheckDefFailure(["let x = '1'is '2'"], msg, 1)
878878

879-
let msg = "white space required before and after 'isnot'"
879+
let msg = "White space required before and after 'isnot'"
880880
call CheckDefFailure(["let x = '1'isnot'2'"], msg, 1)
881881
call CheckDefFailure(["let x = '1' isnot'2'"], msg, 1)
882882
call CheckDefFailure(["let x = '1'isnot '2'"], msg, 1)
@@ -1151,17 +1151,17 @@ def Test_expr5_float()
11511151
enddef
11521152

11531153
func Test_expr5_fails()
1154-
let msg = "white space required before and after '+'"
1154+
let msg = "White space required before and after '+'"
11551155
call CheckDefFailure(["let x = 1+2"], msg, 1)
11561156
call CheckDefFailure(["let x = 1 +2"], msg, 1)
11571157
call CheckDefFailure(["let x = 1+ 2"], msg, 1)
11581158

1159-
let msg = "white space required before and after '-'"
1159+
let msg = "White space required before and after '-'"
11601160
call CheckDefFailure(["let x = 1-2"], msg, 1)
11611161
call CheckDefFailure(["let x = 1 -2"], msg, 1)
11621162
call CheckDefFailure(["let x = 1- 2"], msg, 1)
11631163

1164-
let msg = "white space required before and after '..'"
1164+
let msg = "White space required before and after '..'"
11651165
call CheckDefFailure(["let x = '1'..'2'"], msg, 1)
11661166
call CheckDefFailure(["let x = '1' ..'2'"], msg, 1)
11671167
call CheckDefFailure(["let x = '1'.. '2'"], msg, 1)
@@ -1306,17 +1306,17 @@ def Test_expr6_float()
13061306
enddef
13071307

13081308
func Test_expr6_fails()
1309-
let msg = "white space required before and after '*'"
1309+
let msg = "White space required before and after '*'"
13101310
call CheckDefFailure(["let x = 1*2"], msg, 1)
13111311
call CheckDefFailure(["let x = 1 *2"], msg, 1)
13121312
call CheckDefFailure(["let x = 1* 2"], msg, 1)
13131313

1314-
let msg = "white space required before and after '/'"
1314+
let msg = "White space required before and after '/'"
13151315
call CheckDefFailure(["let x = 1/2"], msg, 1)
13161316
call CheckDefFailure(["let x = 1 /2"], msg, 1)
13171317
call CheckDefFailure(["let x = 1/ 2"], msg, 1)
13181318

1319-
let msg = "white space required before and after '%'"
1319+
let msg = "White space required before and after '%'"
13201320
call CheckDefFailure(["let x = 1%2"], msg, 1)
13211321
call CheckDefFailure(["let x = 1 %2"], msg, 1)
13221322
call CheckDefFailure(["let x = 1% 2"], msg, 1)
@@ -1658,7 +1658,7 @@ def Test_expr7_lambda()
16581658
assert_equal('xxxyyy', 'xxx'->{a, b -> a .. b}('yyy'))
16591659

16601660
CheckDefExecFailure(["let s = 'asdf'->{a -> a}('x')"],
1661-
'E1106: one argument too many')
1661+
'E1106: One argument too many')
16621662
CheckDefExecFailure(["let s = 'asdf'->{a -> a}('x', 'y')"],
16631663
'E1106: 2 arguments too many')
16641664
CheckDefFailure(["echo 'asdf'->{a -> a}(x)"], 'E1001:', 1)

0 commit comments

Comments
 (0)