Mercurial > vim
changeset 32816:939396a5711c v9.0.1722
patch 9.0.1722: wrong error messages when passing wrong types to count()
Commit: https://github.com/vim/vim/commit/4f389e7c0fe7dfeccfa512a72fa36f9028d57159
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu Aug 17 22:10:40 2023 +0200
patch 9.0.1722: wrong error messages when passing wrong types to count()
Problem: wrong error messages when passing wrong types to count()
Solution: fix it
This fixes two problems:
1. When passing wrong type to {ic} argument of count(), two error
messages are given, the second of which is misleading.
2. When passing wrong type to {comp} argument of count(), the error
message doesn't mention that {comp} may be a String.
closes: #12825
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 17 Aug 2023 22:15:03 +0200 |
| parents | fb376df77503 |
| children | 4fa5838c6952 |
| files | src/errors.h src/list.c src/testdir/test_functions.vim src/version.c |
| diffstat | 4 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -1802,7 +1802,8 @@ EXTERN char e_funcref_variable_name_must INIT(= N_("E704: Funcref variable name must start with a capital: %s")); EXTERN char e_variable_name_conflicts_with_existing_function_str[] INIT(= N_("E705: Variable name conflicts with existing function: %s")); -// E706 unused +EXTERN char e_argument_of_str_must_be_list_string_or_dictionary[] + INIT(= N_("E706: Argument of %s must be a List, String or Dictionary")); EXTERN char e_function_name_conflicts_with_variable_str[] INIT(= N_("E707: Function name conflicts with variable: %s")); EXTERN char e_slice_must_come_last[]
--- a/src/list.c +++ b/src/list.c @@ -2735,8 +2735,9 @@ f_count(typval_T *argvars, typval_T *ret else n = dict_count(argvars[0].vval.v_dict, &argvars[1], ic); } - else - semsg(_(e_argument_of_str_must_be_list_or_dictionary), "count()"); + else if (!error) + semsg(_(e_argument_of_str_must_be_list_string_or_dictionary), + "count()"); rettv->vval.v_number = n; }
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1749,7 +1749,8 @@ func Test_count() call assert_equal(2, count("fooooo", "oo")) call assert_equal(0, count("foo", "")) - call assert_fails('call count(0, 0)', 'E712:') + call assert_fails('call count(0, 0)', 'E706:') + call assert_fails('call count("", "", {})', ['E728:', 'E728:']) endfunc func Test_changenr()