mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-22 19:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): correctly pass f-args for nvim_create_user_command (#18098)

Browse Source 
Skip runs of whitespace and do not include `\` characters when
followed by another `\` or whitespace. This matches the behavior
of <f-args> when used with `:command`.
This commit is contained in:
Gregory Anders
2022-04-13 08:04:56 -06:00
committed by GitHub
parent 4dc09f38ee
commit e463eb8146
3 changed files with 86 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/nvim/ex_docmd.c
View File

@@ -5774,26 +5774,44 @@ static void ex_delcommand(exarg_T *eap)
/// Split a string by unescaped whitespace (space & tab), used for f-args on Lua commands callback.
/// Similar to uc_split_args(), but does not allocate, add quotes, add commas and is an iterator.
///
/// @note If no separator is found start = 0 and end = length - 1
/// @param[in] arg String to split
/// @param[in] iter Iteration counter
/// @param[out] start Start of the split
/// @param[out] end End of the split
/// @param[in] length Length of the string
/// @param[in] arg String to split
/// @param[in] arglen Length of {arg}
/// @param[inout] end Index of last character of previous iteration
/// @param[out] buf Buffer to copy string into
/// @param[out] len Length of string in {buf}
///
/// @return false if it's the last split (don't call again), true otherwise (call again).
bool uc_split_args_iter(const char_u *arg, int iter, int *start, int *end, int length)
/// @return true if iteration is complete, else false
bool uc_split_args_iter(const char_u *arg, size_t arglen, size_t *end, char *buf, size_t *len)
{
int pos;
*start = *end + (iter > 1 ? 2 : 0); // Skip whitespace after the first split
for (pos = *start; pos < length - 2; pos++) {
if (arg[pos] != '\\' && ascii_iswhite(arg[pos + 1])) {
*end = pos;
return true;
if (!arglen) {
return true;
}
size_t pos = *end;
while (pos < arglen && ascii_iswhite(arg[pos])) {
pos++;
}
size_t l = 0;
for (; pos < arglen - 1; pos++) {
if (arg[pos] == '\\' && (arg[pos + 1] == '\\' || ascii_iswhite(arg[pos + 1]))) {
buf[l++] = arg[++pos];
} else {
buf[l++] = arg[pos];
if (ascii_iswhite(arg[pos + 1])) {
*end = pos + 1;
*len = l;
return false;
}
}
}
*end = length - 1;
return false;
if (pos < arglen && !ascii_iswhite(arg[pos])) {
buf[l++] = arg[pos];
}
*len = l;
return true;
}
/// split and quote args for <f-args>