Mercurial > vim
diff src/sign.c @ 29994:86eb4aba16c3 v9.0.0335
patch 9.0.0335: checks for Dictionary argument often give a vague error
Commit: https://github.com/vim/vim/commit/04c4c5746e15884768d2cb41370c3276a196cd4c
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Tue Aug 30 19:48:24 2022 +0100
patch 9.0.0335: checks for Dictionary argument often give a vague error
Problem: Checks for Dictionary argument often give a vague error message.
Solution: Give a useful error message. (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/11009)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 30 Aug 2022 21:00:05 +0200 |
| parents | 89e1d67814a9 |
| children | adb0de8be4ce |
line wrap: on
line diff
--- a/src/sign.c +++ b/src/sign.c @@ -2349,11 +2349,8 @@ f_sign_define(typval_T *argvars, typval_ if (name == NULL) return; - if (argvars[1].v_type != VAR_UNKNOWN && argvars[1].v_type != VAR_DICT) - { - emsg(_(e_dictionary_required)); + if (check_for_opt_dict_arg(argvars, 1) == FAIL) return; - } rettv->vval.v_number = sign_define_from_dict(name, argvars[1].v_type == VAR_DICT ? argvars[1].vval.v_dict : NULL); @@ -2411,12 +2408,9 @@ f_sign_getplaced(typval_T *argvars, typv if (argvars[1].v_type != VAR_UNKNOWN) { - if (argvars[1].v_type != VAR_DICT || - ((dict = argvars[1].vval.v_dict) == NULL)) - { - emsg(_(e_dictionary_required)); + if (check_for_nonnull_dict_arg(argvars, 1) == FAIL) return; - } + dict = argvars[1].vval.v_dict; if ((di = dict_find(dict, (char_u *)"lnum", -1)) != NULL) { // get signs placed at this line @@ -2640,12 +2634,11 @@ f_sign_place(typval_T *argvars, typval_T || check_for_opt_dict_arg(argvars, 4) == FAIL)) return; - if (argvars[4].v_type != VAR_UNKNOWN - && (argvars[4].v_type != VAR_DICT - || ((dict = argvars[4].vval.v_dict) == NULL))) + if (argvars[4].v_type != VAR_UNKNOWN) { - emsg(_(e_dictionary_required)); - return; + if (check_for_nonnull_dict_arg(argvars, 4) == FAIL) + return; + dict = argvars[4].vval.v_dict; } rettv->vval.v_number = sign_place_from_dict(&argvars[0], &argvars[1], @@ -2872,11 +2865,8 @@ f_sign_unplace(typval_T *argvars, typval if (argvars[1].v_type != VAR_UNKNOWN) { - if (argvars[1].v_type != VAR_DICT) - { - emsg(_(e_dictionary_required)); + if (check_for_dict_arg(argvars, 1) == FAIL) return; - } dict = argvars[1].vval.v_dict; }