mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-09 11:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2646: Vim9: error for not using string doesn't mention argument

Browse Source 
Problem:    Vim9: error for not using string doesn't mention argument.
Solution:   Add argument number.
f28f2ac425
This commit is contained in:
zeertzjq
2022-09-12 14:03:32 +08:00
parent f98cff9575
commit 38059b4f31
5 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/nvim/eval/typval.c
View File

@@ -40,6 +40,11 @@
# include "eval/typval.c.generated.h"
#endif
static char e_string_required_for_argument_nr[]
= N_("E1174: String required for argument %d");
static char e_non_empty_string_required_for_argument_nr[]
= N_("E1142: Non-empty string required for argument %d");
bool tv_in_free_unref_items = false;
// TODO(ZyX-I): Remove DICT_MAXNEST, make users be non-recursive instead
@@ -3800,26 +3805,34 @@ float_T tv_get_float(const typval_T *const tv)
return 0;
}
// Give an error and return FAIL unless "tv" is a string.
int tv_check_for_string(const typval_T *const tv)
/// Give an error and return FAIL unless "tv" is a string.
int tv_check_for_string(const typval_T *const tv, const int arg)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE
{
if (tv->v_type != VAR_STRING) {
emsg(_(e_stringreq));
if (arg > 0) {
semsg(_(e_string_required_for_argument_nr), arg);
} else {
emsg(_(e_stringreq));
}
return FAIL;
}
return OK;
}
// Give an error and return FAIL unless "tv" is a non-empty string.
int tv_check_for_nonempty_string(const typval_T *const tv)
/// Give an error and return FAIL unless "tv" is a non-empty string.
int tv_check_for_nonempty_string(const typval_T *const tv, const int arg)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE
{
if (tv_check_for_string(tv) == FAIL) {
if (tv_check_for_string(tv, arg) == FAIL) {
return FAIL;
}
if (tv->vval.v_string == NULL || *tv->vval.v_string == NUL) {
emsg(_(e_non_empty_string_required));
if (arg > 0) {
semsg(_(e_non_empty_string_required_for_argument_nr), arg);
} else {
emsg(_(e_non_empty_string_required));
}
return FAIL;
}
return OK;