mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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 #8440)
This commit is contained in:
@@ -446,3 +446,5 @@ EXTERN char e_libsodium_decryption_failed[]
|
||||
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"));
|
||||
|
@@ -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
|
||||
|
||||
|
||||
|
@@ -755,6 +755,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
3048,
|
||||
/**/
|
||||
3047,
|
||||
/**/
|
||||
|
@@ -6639,6 +6639,12 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
|
||||
}
|
||||
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;
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user