aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.2265: error message for missing endfunc/enddef is last line

Browse Source 
Problem:    Error message for missing endfunc/enddef is last line.
Solution:   Report the line where the function starts. (closes #7582)
This commit is contained in:
Bram Moolenaar 2021-01-01 18:54:34 +01:00
parent 5178b1b02f
commit b8ba9b9197
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/testdir/test_vim9_func.vim
View File

@ -98,6 +98,24 @@ def Test_endfunc_enddef()
CheckScriptFailure(lines, 'E1152:', 4) CheckScriptFailure(lines, 'E1152:', 4)
enddef enddef
def Test_missing_endfunc_enddef()
var lines =<< trim END
vim9script
def Test()
echo 'test'
endef
END
CheckScriptFailure(lines, 'E1057:', 2)
lines =<< trim END
vim9script
func Some()
echo 'test'
enfffunc
END
CheckScriptFailure(lines, 'E126:', 2)
enddef
def ReturnString(): string def ReturnString(): string
return 'string' return 'string'
enddef enddef

2
src/userfunc.c
View File

@ -3352,6 +3352,8 @@ define_function(exarg_T *eap, char_u *name_arg)
lines_left = Rows - 1; lines_left = Rows - 1;
if (theline == NULL) if (theline == NULL)
{ {
// Use the start of the function for the line number.
SOURCING_LNUM = sourcing_lnum_top;
if (skip_until != NULL) if (skip_until != NULL)
semsg(_(e_missing_heredoc_end_marker_str), skip_until); semsg(_(e_missing_heredoc_end_marker_str), skip_until);
else if (eap->cmdidx == CMD_def) else if (eap->cmdidx == CMD_def)

2
src/version.c
View File

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