Mercurial > vim
changeset 25022:39551b6e0112 v8.2.3048
patch 8.2.3048: strange error for white space after ++ command
Commit: https://github.com/vim/vim/commit/22480d147fe83cb31316d2dabc5c5f249477af15
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jun 25 21:31:09 2021 +0200
patch 8.2.3048: strange error for white space after ++ command
Problem: Strange error for white space after ++ command.
Solution: Check for white space explicitly. (closes https://github.com/vim/vim/issues/8440)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 25 Jun 2021 21:45:03 +0200 |
parents | bff757c48ad5 |
children | 681a896e37e3 |
files | src/errors.h src/testdir/test_vim9_assign.vim src/version.c src/vim9compile.c src/vim9script.c |
diffstat | 5 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -446,3 +446,5 @@ EXTERN char e_libsodium_decryption_faile INIT(= N_("E1200: Decryption failed!")); EXTERN char e_libsodium_decryption_failed_premature[] INIT(= N_("E1201: Decryption failed: pre-mature end of file!")); +EXTERN char e_no_white_space_allowed_after_str_str[] + INIT(= N_("E1202: No white space allowed after '%s': %s"));
--- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -1906,6 +1906,12 @@ def Test_inc_dec() unlet g:count END CheckDefAndScriptSuccess(lines) + + lines =<< trim END + var nr = 7 + ++ nr + END + CheckDefAndScriptFailure(lines, "E1202: No white space allowed after '++': ++ nr") enddef
--- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3048, +/**/ 3047, /**/ 3046,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -6639,6 +6639,12 @@ compile_assignment(char_u *arg, exarg_T } if (eap->cmdidx == CMD_increment || eap->cmdidx == CMD_decrement) { + if (VIM_ISWHITE(eap->cmd[2])) + { + semsg(_(e_no_white_space_allowed_after_str_str), + eap->cmdidx == CMD_increment ? "++" : "--", eap->cmd); + return NULL; + } op = (char_u *)(eap->cmdidx == CMD_increment ? "+=" : "-="); oplen = 2; incdec = TRUE;
--- a/src/vim9script.c +++ b/src/vim9script.c @@ -169,6 +169,13 @@ ex_incdec(exarg_T *eap) char_u *nextcmd = eap->nextcmd; size_t len = STRLEN(eap->cmd) + 8; + if (VIM_ISWHITE(cmd[2])) + { + semsg(_(e_no_white_space_allowed_after_str_str), + eap->cmdidx == CMD_increment ? "++" : "--", eap->cmd); + return; + } + // This works like "nr += 1" or "nr -= 1". // Add a '|' to avoid looking in the next line. eap->cmd = alloc(len);