aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.2012: Vim9: error message can be more accurate

Browse Source 
Problem:  Vim9: error message can be more accurate
Solution: Fix the error messages

Fix message for some single use error messages.

closes: #13312

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Ernie Rael <errael@raelity.com>
This commit is contained in:
Ernie Rael
2023-10-11 21:22:12 +02:00
committed by Christian Brabandt
parent 4a82bdfaa8
commit f8da324619
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/errors.h
View File

@@ -1771,8 +1771,8 @@ EXTERN char e_less_targets_than_list_items[]
INIT(= N_("E687: Less targets than List items")); INIT(= N_("E687: Less targets than List items"));
EXTERN char e_more_targets_than_list_items[] EXTERN char e_more_targets_than_list_items[]
INIT(= N_("E688: More targets than List items")); INIT(= N_("E688: More targets than List items"));
EXTERN char e_can_only_index_list_dictionary_or_blob[] EXTERN char e_index_not_allowed_after_str_str[]
INIT(= N_("E689: Can only index a List, Dictionary or Blob")); INIT(= N_("E689: Index not allowed after a %s: %s"));
EXTERN char e_missing_in_after_for[] EXTERN char e_missing_in_after_for[]
INIT(= N_("E690: Missing \"in\" after :for")); INIT(= N_("E690: Missing \"in\" after :for"));
EXTERN char e_can_only_compare_list_with_list[] EXTERN char e_can_only_compare_list_with_list[]
@@ -3081,8 +3081,8 @@ EXTERN char e_libsodium_decryption_failed_premature[]
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
EXTERN char e_no_white_space_allowed_after_str_str[] EXTERN char e_no_white_space_allowed_after_str_str[]
INIT(= N_("E1202: No white space allowed after '%s': %s")); INIT(= N_("E1202: No white space allowed after '%s': %s"));
EXTERN char e_dot_can_only_be_used_on_dictionary_str[] EXTERN char e_dot_not_allowed_after_str_str[]
INIT(= N_("E1203: Dot can only be used on a dictionary: %s")); INIT(= N_("E1203: Dot not allowed after a %s: %s"));
#endif #endif
EXTERN char e_regexp_number_after_dot_pos_search_chr[] EXTERN char e_regexp_number_after_dot_pos_search_chr[]
INIT(= N_("E1204: No Number allowed after .: '\\%%%c'")); INIT(= N_("E1204: No Number allowed after .: '\\%%%c'"));

8
src/eval.c
View File

@@ -1375,9 +1375,9 @@ get_lval(
&& v_type != VAR_OBJECT && v_type != VAR_OBJECT
&& v_type != VAR_CLASS) && v_type != VAR_CLASS)
{ {
// TODO: have a message with obj/class, not just dict,
if (!quiet) if (!quiet)
semsg(_(e_dot_can_only_be_used_on_dictionary_str), name); semsg(_(e_dot_not_allowed_after_str_str),
vartype_name(v_type), name);
return NULL; return NULL;
} }
if (v_type != VAR_LIST if (v_type != VAR_LIST
@@ -1386,9 +1386,9 @@ get_lval(
&& v_type != VAR_OBJECT && v_type != VAR_OBJECT
&& v_type != VAR_CLASS) && v_type != VAR_CLASS)
{ {
// TODO: have a message with obj/class, not just dict/list/blob,
if (!quiet) if (!quiet)
emsg(_(e_can_only_index_list_dictionary_or_blob)); semsg(_(e_index_not_allowed_after_str_str),
vartype_name(v_type), name);
return NULL; return NULL;
} }

4
src/testdir/test_listdict.vim
View File

@@ -435,13 +435,13 @@ func Test_dict_assign()
let n = 0 let n = 0
let n.key = 3 let n.key = 3
END END
call v9.CheckScriptFailure(lines, 'E1203: Dot can only be used on a dictionary: n.key = 3') call v9.CheckScriptFailure(lines, 'E1203: Dot not allowed after a number: n.key = 3')
let lines =<< trim END let lines =<< trim END
vim9script vim9script
var n = 0 var n = 0
n.key = 3 n.key = 3
END END
call v9.CheckScriptFailure(lines, 'E1203: Dot can only be used on a dictionary: n.key = 3') call v9.CheckScriptFailure(lines, 'E1203: Dot not allowed after a number: n.key = 3')
let lines =<< trim END let lines =<< trim END
var n = 0 var n = 0
n.key = 3 n.key = 3

2
src/testdir/test_vim9_assign.vim
View File

@@ -1278,7 +1278,7 @@ def Test_assignment_dict()
var n: any var n: any
n.key = 5 n.key = 5
END END
v9.CheckDefExecAndScriptFailure(lines, ['E1148:', 'E1203: Dot can only be used on a dictionary: n.key = 5'], 2) v9.CheckDefExecAndScriptFailure(lines, ['E1148:', 'E1203: Dot not allowed after a number: n.key = 5'], 2)
enddef enddef
def Test_assignment_local() def Test_assignment_local()

2
src/version.c
View File

@@ -704,6 +704,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 */
/**/
2012,
/**/ /**/
2011, 2011,
/**/ /**/