diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-08-22 22:09:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 22:09:53 +0800 |
| commit | baaaa1f2b3b6ae3a989d1362a27e55dc7b0b148a (patch) | |
| tree | e95acb31f5006385393ad8fdfe90345b1b150828 /src/nvim/eval/funcs.c | |
| parent | 15a768eeb02e2af39eead1ea1eb4a5a60710d6fb (diff) | |
| download | rneovim-baaaa1f2b3b6ae3a989d1362a27e55dc7b0b148a.tar.gz rneovim-baaaa1f2b3b6ae3a989d1362a27e55dc7b0b148a.tar.bz2 rneovim-baaaa1f2b3b6ae3a989d1362a27e55dc7b0b148a.zip | |
vim-patch:8.2.3421: a bit of code is not covered by tests (#19895)
Problem: A bit of code is not covered by tests.
Solution: Add a few more test cases. (Dominique Pellé, closes vim/vim#8857)
https://github.com/vim/vim/commit/d176ca3dde47c11aae0376c31b7e1ba0939c8c6c
Cherry-pick Test_trim() change from patch 8.2.0448.
Cherry-pick Test_History() change from patch 8.2.1736.
Cherry-pick charidx() and trim() type checks from patch 8.2.3135.
Diffstat (limited to 'src/nvim/eval/funcs.c')
| -rw-r--r-- | src/nvim/eval/funcs.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 94fda654f3..181b17f747 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -874,7 +874,8 @@ static void f_charidx(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (argvars[0].v_type != VAR_STRING || argvars[1].v_type != VAR_NUMBER || (argvars[2].v_type != VAR_UNKNOWN - && argvars[2].v_type != VAR_NUMBER)) { + && argvars[2].v_type != VAR_NUMBER + && argvars[2].v_type != VAR_BOOL)) { emsg(_(e_invarg)); return; } @@ -9460,6 +9461,11 @@ static void f_trim(typval_T *argvars, typval_T *rettv, FunPtr fptr) return; } + if (argvars[1].v_type != VAR_UNKNOWN && argvars[1].v_type != VAR_STRING) { + semsg(_(e_invarg2), tv_get_string(&argvars[1])); + return; + } + if (argvars[1].v_type == VAR_STRING) { mask = (const char_u *)tv_get_string_buf_chk(&argvars[1], buf2); if (argvars[2].v_type != VAR_UNKNOWN) { |