neovim

commit 9c272b75ecf955afe7feedc209f5d9a3b7116650
parent 8781213f00a22e20abeb4282204e900db799f4b5
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Mon, 10 Oct 2022 21:11:12 +0800

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

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)
https://github.com/vim/vim/commit/9a963377b4811e4e0419ec8825856ff4b01331ac

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.
https://github.com/vim/vim/commit/56acb0943ede35cd9d2f6667cde2442819ccbf59

Diffstat:
M
src/nvim/eval/funcs.c
 | 
3
+++
M
src/nvim/eval/typval.c
 | 
2
+-
M
src/nvim/testdir/test_cursor_func.vim
 | 
2
+-

3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
@@ -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)
              && (argvars[1].v_type == VAR_NUMBER || argvars[1].v_type == VAR_STRING)) {
     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);
     if (charcol) {
       col = buf_charidx_to_byteidx(curbuf, (linenr_T)line, (int)col) + 1;
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
@@ -3751,7 +3751,7 @@ linenr_T tv_get_lnum(const typval_T *const tv)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
 {
   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;
     pos_T *const fp = var2fpos(tv, true, &fnum, false);
     if (fp != NULL) {
diff --git a/src/nvim/testdir/test_cursor_func.vim b/src/nvim/testdir/test_cursor_func.vim
@@ -32,7 +32,7 @@ func Test_move_cursor()
   call cursor(1, 1, 1)
   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!
 endfunc