mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 10:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2184: Vim9: no error when using "2" for a line number

Browse Source 
Problem:    Vim9: no error when using "2" for a line number.
Solution:   Give an error message if the line number is invalid. (closes vim/vim#7492)
9a963377b4

N/A patches for version.c:

vim-patch:8.2.1465: Vim9: subscript not handled properly

Problem:    Vim9: subscript not handled properly.
Solution:   Adjust error message.  Remove dead code.  Disallow string to
            number conversion in scripts.
56acb0943e
This commit is contained in:
zeertzjq
2022-10-10 21:11:12 +08:00
parent 8781213f00
commit 9c272b75ec
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/eval/funcs.c
View File

@@ -1294,6 +1294,9 @@ static void set_cursorpos(typval_T *argvars, typval_T *rettv, bool charcol)
} else if ((argvars[0].v_type == VAR_NUMBER || argvars[0].v_type == VAR_STRING) } else if ((argvars[0].v_type == VAR_NUMBER || argvars[0].v_type == VAR_STRING)
&& (argvars[1].v_type == VAR_NUMBER || argvars[1].v_type == VAR_STRING)) { && (argvars[1].v_type == VAR_NUMBER || argvars[1].v_type == VAR_STRING)) {
line = tv_get_lnum(argvars); line = tv_get_lnum(argvars);
if (line < 0) {
semsg(_(e_invarg2), tv_get_string(&argvars[0]));
}
col = (long)tv_get_number_chk(&argvars[1], NULL); col = (long)tv_get_number_chk(&argvars[1], NULL);
if (charcol) { if (charcol) {
col = buf_charidx_to_byteidx(curbuf, (linenr_T)line, (int)col) + 1; col = buf_charidx_to_byteidx(curbuf, (linenr_T)line, (int)col) + 1;

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

@@ -3751,7 +3751,7 @@ linenr_T tv_get_lnum(const typval_T *const tv)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
{ {
linenr_T lnum = (linenr_T)tv_get_number_chk(tv, NULL); linenr_T lnum = (linenr_T)tv_get_number_chk(tv, NULL);
if (lnum == 0) { // No valid number, try using same function as line() does. if (lnum <= 0) { // No valid number, try using same function as line() does.
int fnum; int fnum;
pos_T *const fp = var2fpos(tv, true, &fnum, false); pos_T *const fp = var2fpos(tv, true, &fnum, false);
if (fp != NULL) { if (fp != NULL) {

2
src/nvim/testdir/test_cursor_func.vim
View File

@@ -32,7 +32,7 @@ func Test_move_cursor()
call cursor(1, 1, 1) call cursor(1, 1, 1)
call assert_equal([1, 1, 1], getcurpos()[1:3]) call assert_equal([1, 1, 1], getcurpos()[1:3])
call assert_equal(-1, cursor(-1, -1)) call assert_fails('call cursor(-1, -1)', 'E475:')
quit! quit!
endfunc endfunc