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)

diff --git a/src/errors.h b/src/errors.h
index 4f404b533595d7185ed568364bf90b670c76bfb7..b0b4194ca5c5cba0cd6b72b3e023494d6e2d3191 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -133,8 +133,8 @@ EXTERN char e_item_not_found_in_script_str[]
        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[]

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

diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 9790789a07576b73ffc4beba90d5e8b5c6353788..a55ba64031e1fc43a474641ed4e8e366e5a5a4c4 100644 (file)
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -549,7 +549,7 @@ def Test_modifier_silent_unsilent()
 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 _'])

diff --git a/src/version.c b/src/version.c
index 8f9a54e0ea70c57a0cfe4072ed02fb79b4cbbffa..6f30739b74c6c9a9adf30302c868a286621ca7c8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2216,
 /**/
     2215,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index b035333d27da777dc9c7c0d4afec35913c90be35..2b1f65114da51d7978781d3007ae5db73b8df702 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7727,7 +7727,7 @@ compile_def_function(ufunc_T *ufunc, int check_return_type, cctx_T *outer_cctx)
            {
                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))