diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-25 19:25:45 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-25 19:25:45 +0100 |
| commit | 6e2c2c50bada4e3f5c7234902c0bdd64f66619ac (patch) | |
| tree | fe876fd433cd8c47572574d05fdeb28eb375a653 | |
| parent | 56ce9ea3ea46529cac2fdf3151abfa0e1ae49bad (diff) | |
| download | vim-git-6e2c2c50bada4e3f5c7234902c0bdd64f66619ac.tar.gz | |
patch 8.2.2216: Vim9: range with missing colon can be hard to spotv8.2.2216
Problem: Vim9: range with missing colon can be hard to spot.
Solution: Include the start of the range in the error. (closes #7543)
| -rw-r--r-- | src/errors.h | 4 | ||||
| -rw-r--r-- | src/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_cmd.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/src/errors.h b/src/errors.h index 4f404b533..b0b4194ca 100644 --- 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 3bb3d4968..69e3f12e6 100644 --- 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 9790789a0..a55ba6403 100644 --- 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 8f9a54e0e..6f30739b7 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2216, +/**/ 2215, /**/ 2214, diff --git a/src/vim9compile.c b/src/vim9compile.c index b035333d2..2b1f65114 100644 --- 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)) |