commit 6e2c2c50bada4e3f5c7234902c0bdd64f66619ac
author Bram Moolenaar <Bram@vim.org> Fri Dec 25 19:25:45 2020 +0100
committer Bram Moolenaar <Bram@vim.org> Fri Dec 25 19:25:45 2020 +0100
tree fe876fd433cd8c47572574d05fdeb28eb375a653
parent 56ce9ea3ea46529cac2fdf3151abfa0e1ae49bad

patch 8.2.2216: Vim9: range with missing colon can be hard to spot

Problem:    Vim9: range with missing colon can be hard to spot.
Solution:   Include the start of the range in the error. (closes #7543)

src/errors.h

diff --git a/src/errors.h b/src/errors.h
index 4f404b5..b0b4194 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -133,8 +133,8 @@
 	INIT(= N_("E1048: Item not found in script: %s"));
 EXTERN char e_item_not_exported_in_script_str[]
 	INIT(= N_("E1049: Item not exported in script: %s"));
-EXTERN char e_colon_required_before_a_range[]
-	INIT(= N_("E1050: Colon required before a range"));
+EXTERN char e_colon_required_before_range_str[]
+	INIT(= N_("E1050: Colon required before a range: %s"));
 EXTERN char e_wrong_argument_type_for_plus[]
 	INIT(= N_("E1051: Wrong argument type for +"));
 EXTERN char e_cannot_declare_an_option[]

src/ex_docmd.c

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 3bb3d49..69e3f12 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1839,7 +1839,7 @@
 	    // message.
 	    if (ar > ea.cmd)
 	    {
-		emsg(_(e_colon_required_before_a_range));
+		semsg(_(e_colon_required_before_range_str), ea.cmd);
 		goto doend;
 	    }
 	}

src/testdir/test_vim9_cmd.vim

diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 9790789..a55ba64 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -549,7 +549,7 @@
 enddef
 
 def Test_range_after_command_modifier()
-  CheckScriptFailure(['vim9script', 'silent keepjump 1d _'], 'E1050:', 2)
+  CheckScriptFailure(['vim9script', 'silent keepjump 1d _'], 'E1050: Colon required before a range: 1d _', 2)
   new
   setline(1, 'xxx')
   CheckScriptSuccess(['vim9script', 'silent keepjump :1d _'])

src/version.c

diff --git a/src/version.c b/src/version.c
index 8f9a54e..6f30739 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2216,
+/**/
     2215,
 /**/
     2214,

src/vim9compile.c

diff --git a/src/vim9compile.c b/src/vim9compile.c
index b035333..2b1f651 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7727,7 +7727,7 @@
 	    {
 		if (!starts_with_colon)
 		{
-		    emsg(_(e_colon_required_before_a_range));
+		    semsg(_(e_colon_required_before_range_str), cmd);
 		    goto erret;
 		}
 		if (ends_excmd2(line, ea.cmd))