thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

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 #7492)
This commit is contained in:
Bram Moolenaar 2020-12-21 21:58:46 +01:00
parent 60f63100b9
commit 9a963377b4
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/evalfunc.c
View File

@ -2615,6 +2615,8 @@ f_cursor(typval_T *argvars, typval_T *rettv)
else
{
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 (argvars[2].v_type != VAR_UNKNOWN)
coladd = (long)tv_get_number_chk(&argvars[2], NULL);

2
src/testdir/test_cursor_func.vim
View File

@ -30,7 +30,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

14
src/testdir/test_vim9_builtin.vim
View File

@ -185,6 +185,20 @@ def Test_count()
count('ABC ABC ABC', 'b', false)->assert_equal(0)
enddef
def Test_cursor()
new
setline(1, range(4))
cursor(2, 1)
assert_equal(2, getcurpos()[1])
cursor('$', 1)
assert_equal(4, getcurpos()[1])
var lines =<< trim END
cursor('2', 1)
END
CheckDefExecAndScriptFailure(lines, 'E475:')
enddef
def Test_executable()
assert_false(executable(""))
assert_false(executable(test_null_string()))

4
src/typval.c
View File

@ -1536,11 +1536,11 @@ eval_env_var(char_u **arg, typval_T *rettv, int evaluate)
linenr_T
tv_get_lnum(typval_T *argvars)
{
linenr_T lnum = 0;
linenr_T lnum = -1;
if (argvars[0].v_type != VAR_STRING || !in_vim9script())
lnum = (linenr_T)tv_get_number_chk(&argvars[0], NULL);
if (lnum == 0) // no valid number, try using arg like line()
if (lnum <= 0) // no valid number, try using arg like line()
{
int fnum;
pos_T *fp = var2fpos(&argvars[0], TRUE, &fnum);

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2184,
/**/
2183,
/**/