Mercurial > vim
changeset 25216:9ead67e3c696 v8.2.3144
patch 8.2.3144: Vim9: no error when using an invalid value for a line number
Commit: https://github.com/vim/vim/commit/0f1227f7d5a3e368f61d396c1640088c079fef91
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 11 16:01:58 2021 +0200
patch 8.2.3144: Vim9: no error when using an invalid value for a line number
Problem: Vim9: no error when using an invalid value for a line number.
Solution: Give an error if the string value is not recognized.
(closes #8536)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 11 Jul 2021 16:15:03 +0200 |
parents | a7588e54bd5d |
children | 3b0dbea898e9 |
files | src/errors.h src/eval.c src/testdir/test_vim9_builtin.vim src/version.c |
diffstat | 4 files changed, 27 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -498,3 +498,5 @@ EXTERN char e_expression_without_effect_ INIT(= N_("E1207: Expression without an effect: %s")); EXTERN char e_complete_used_without_nargs[] INIT(= N_("E1208: -complete used without -nargs")); +EXTERN char e_invalid_value_for_line_number_str[] + INIT(= N_("E1209: Invalid value for a line number: \"%s\""));
--- a/src/eval.c +++ b/src/eval.c @@ -5376,6 +5376,8 @@ var2fpos( } return &pos; } + if (in_vim9script()) + semsg(_(e_invalid_value_for_line_number_str), name); return NULL; }
--- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -474,7 +474,7 @@ def Test_cursor() var lines =<< trim END cursor('2', 1) END - CheckDefExecAndScriptFailure(lines, 'E475:') + CheckDefExecAndScriptFailure(lines, 'E1209:') enddef def Test_debugbreak() @@ -1036,6 +1036,25 @@ def Test_getjumplist() CheckDefFailure(['getjumplist(1, "x")'], 'E1013: Argument 2: type mismatch, expected number but got string') enddef +def Test_getline() + var lines =<< trim END + new + setline(1, ['hello', 'there', 'again']) + assert_equal('hello', getline(1)) + assert_equal('hello', getline('.')) + + normal 2Gvjv + assert_equal('there', getline("'<")) + assert_equal('again', getline("'>")) + END + CheckDefAndScriptSuccess(lines) + + lines =<< trim END + echo getline('1') + END + CheckDefExecAndScriptFailure(lines, 'E1209:') +enddef + def Test_getmarklist() CheckDefFailure(['getmarklist([])'], 'E1013: Argument 1: type mismatch, expected string but got list<unknown>') assert_equal([], getmarklist(10000)) @@ -1049,7 +1068,7 @@ enddef def Test_getpos() CheckDefFailure(['getpos(10)'], 'E1013: Argument 1: type mismatch, expected string but got number') assert_equal([0, 1, 1, 0], getpos('.')) - assert_equal([0, 0, 0, 0], getpos('a')) + CheckDefExecFailure(['getpos("a")'], 'E1209:') enddef def Test_getqflist()