Skip to content

Commit 921ba52

Browse files
committed
patch 8.2.3248: Vim9: error message for wrong input uses wrong line number
Problem: Vim9: error message for wrong input uses wrong line number. Solution: Use the line number of the start of the command. (issue #8653)
1 parent 77ab4e2 commit 921ba52

3 files changed

Lines changed: 16 additions & 0 deletions

File tree

src/testdir/test_vim9_script.vim

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,6 +1223,16 @@ def Test_vim9_import_export()
12231223
writefile(import_star_as_lines_dot_space, 'Ximport.vim')
12241224
assert_fails('source Ximport.vim', 'E1074:', '', 1, 'Func')
12251225

1226+
var import_func_duplicated =<< trim END
1227+
vim9script
1228+
import ExportedInc from './Xexport.vim'
1229+
import ExportedInc from './Xexport.vim'
1230+
1231+
ExportedInc()
1232+
END
1233+
writefile(import_func_duplicated, 'Ximport.vim')
1234+
assert_fails('source Ximport.vim', 'E1073:', '', 3, 'Ximport.vim')
1235+
12261236
var import_star_as_duplicated =<< trim END
12271237
vim9script
12281238
import * as Export from './Xexport.vim'

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,8 @@ static char *(features[]) =
755755

756756
static int included_patches[] =
757757
{ /* Add new patch number below this line */
758+
/**/
759+
3248,
758760
/**/
759761
3247,
760762
/**/

src/vim9script.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ handle_import(
411411
int mult = FALSE;
412412
garray_T names;
413413
garray_T as_names;
414+
long start_lnum = SOURCING_LNUM;
414415

415416
tv.v_type = VAR_UNKNOWN;
416417
ga_init2(&names, sizeof(char_u *), 10);
@@ -511,6 +512,9 @@ handle_import(
511512
}
512513
cmd_end = arg;
513514

515+
// Give error messages for the start of the line.
516+
SOURCING_LNUM = start_lnum;
517+
514518
/*
515519
* find script file
516520
*/

0 commit comments

Comments
 (0)