Mercurial > vim
changeset 24208:7a21b2581dce v8.2.2645
patch 8.2.2645: using inline function is not properly tested
Commit: https://github.com/vim/vim/commit/49f1e9ec3e7f4e1b3572367d02a83c2b6ebbed97
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Mar 22 20:49:02 2021 +0100
patch 8.2.2645: using inline function is not properly tested
Problem: Using inline function is not properly tested.
Solution: Add test cases, esp. for errors. Minor code improvements.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 22 Mar 2021 21:00:03 +0100 |
| parents | 29ae46ae449b |
| children | 3422237ca50e |
| files | src/errors.h src/testdir/test_vim9_expr.vim src/testdir/test_vim9_func.vim src/userfunc.c src/version.c |
| diffstat | 5 files changed, 57 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -381,3 +381,5 @@ EXTERN char e_missing_end_block[] INIT(= N_("E1171: Missing } after inline function")); EXTERN char e_cannot_use_default_values_in_lambda[] INIT(= N_("E1172: Cannot use default values in a lambda")); +EXTERN char e_text_found_after_enddef_str[] + INIT(= N_("E1173: Text found after enddef: %s"));
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1961,6 +1961,11 @@ def Test_expr7_lambda_block() return 'no' }) assert_equal(['no', 'yes', 'no'], dll) + + sandbox var Safe = (nr: number): number => { + return nr + 7 + } + assert_equal(10, Safe(3)) END CheckDefAndScriptSuccess(lines) @@ -1968,6 +1973,34 @@ def Test_expr7_lambda_block() map([1, 2], (k, v) => { redrawt }) END CheckDefAndScriptFailure(lines, 'E488') + + lines =<< trim END + var Func = (nr: int) => { + echo nr + } + END + CheckDefAndScriptFailure(lines, 'E1010', 1) + + lines =<< trim END + var Func = (nr: number): int => { + return nr + } + END + CheckDefAndScriptFailure(lines, 'E1010', 1) + + lines =<< trim END + var Func = (nr: number): int => { + return nr + END + CheckDefAndScriptFailure(lines, 'E1171', 1) # line nr is function start + + lines =<< trim END + vim9script + var Func = (nr: number): int => { + var ll =<< ENDIT + nothing + END + CheckScriptFailure(lines, 'E1145: Missing heredoc end marker: ENDIT', 2) enddef def NewLambdaWithComments(): func
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -86,6 +86,16 @@ def Test_endfunc_enddef() enddef END CheckScriptFailure(lines, 'E1152:', 4) + + lines =<< trim END + def Ok() + echo 'hello' + enddef | echo 'there' + def Bad() + echo 'hello' + enddef there + END + CheckScriptFailure(lines, 'E1173: Text found after enddef: there', 6) enddef def Test_missing_endfunc_enddef()
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -731,13 +731,16 @@ get_function_body( else if (line_arg != NULL && *skipwhite(line_arg) != NUL) nextcmd = line_arg; else if (*p != NUL && *p != (vim9_function ? '#' : '"') - && p_verbose > 0 - && eap->cmdidx != CMD_block) - give_warning2(eap->cmdidx == CMD_def - ? (char_u *)_("W1001: Text found after :enddef: %s") - : (char_u *)_("W22: Text found after :endfunction: %s"), - p, TRUE); - if (nextcmd != NULL) + && (vim9_function || p_verbose > 0)) + { + if (eap->cmdidx == CMD_def) + semsg(_(e_text_found_after_enddef_str), p); + else + give_warning2((char_u *) + _("W22: Text found after :endfunction: %s"), + p, TRUE); + } + if (nextcmd != NULL && *skipwhite(nextcmd) != NUL) { // Another command follows. If the line came from "eap" // we can simply point into it, otherwise we need to