aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.3248: Vim9: error message for wrong input uses wrong line number

Browse Source 
Problem:    Vim9: error message for wrong input uses wrong line number.
Solution:   Use the line number of the start of the command. (issue #8653)
This commit is contained in:
Bram Moolenaar
2021-07-29 22:25:05 +02:00
parent 77ab4e28a2
commit 921ba52926
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/testdir/test_vim9_script.vim
View File

@@ -1223,6 +1223,16 @@ def Test_vim9_import_export()
writefile(import_star_as_lines_dot_space, 'Ximport.vim') writefile(import_star_as_lines_dot_space, 'Ximport.vim')
assert_fails('source Ximport.vim', 'E1074:', '', 1, 'Func') assert_fails('source Ximport.vim', 'E1074:', '', 1, 'Func')
var import_func_duplicated =<< trim END
vim9script
import ExportedInc from './Xexport.vim'
import ExportedInc from './Xexport.vim'
ExportedInc()
END
writefile(import_func_duplicated, 'Ximport.vim')
assert_fails('source Ximport.vim', 'E1073:', '', 3, 'Ximport.vim')
var import_star_as_duplicated =<< trim END var import_star_as_duplicated =<< trim END
vim9script vim9script
import * as Export from './Xexport.vim' import * as Export from './Xexport.vim'

2
src/version.c
View File

@@ -755,6 +755,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 */
/**/
3248,
/**/ /**/
3247, 3247,
/**/ /**/

4
src/vim9script.c
View File

@@ -411,6 +411,7 @@ handle_import(
int mult = FALSE; int mult = FALSE;
garray_T names; garray_T names;
garray_T as_names; garray_T as_names;
long start_lnum = SOURCING_LNUM;
tv.v_type = VAR_UNKNOWN; tv.v_type = VAR_UNKNOWN;
ga_init2(&names, sizeof(char_u *), 10); ga_init2(&names, sizeof(char_u *), 10);
@@ -511,6 +512,9 @@ handle_import(
} }
cmd_end = arg; cmd_end = arg;
// Give error messages for the start of the line.
SOURCING_LNUM = start_lnum;
/* /*
* find script file * find script file
*/ */