patch 8.2.4387: command line completion doesn't always work properly
Problem: Command line completion doesn't always work properly.
Solution: Adjust triggering after a "|". Add more tests. (Yegappan
Lakshmanan, closes #9779)
diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index 2a65a06..5cad1db 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -1473,16 +1473,21 @@
// skip "from" part
++arg;
arg = skip_regexp(arg, delim, magic_isset());
- }
- // skip "to" part
- while (arg[0] != NUL && arg[0] != delim)
- {
- if (arg[0] == '\\' && arg[1] != NUL)
+
+ if (arg[0] != NUL && arg[0] == delim)
+ {
+ // skip "to" part
++arg;
- ++arg;
+ while (arg[0] != NUL && arg[0] != delim)
+ {
+ if (arg[0] == '\\' && arg[1] != NUL)
+ ++arg;
+ ++arg;
+ }
+ if (arg[0] != NUL) // skip delimiter
+ ++arg;
+ }
}
- if (arg[0] != NUL) // skip delimiter
- ++arg;
while (arg[0] && vim_strchr((char_u *)"|\"#", arg[0]) == NULL)
++arg;
if (arg[0] != NUL)
@@ -1508,7 +1513,8 @@
arg = skipwhite(arg + 1);
// Check for trailing illegal characters
- if (*arg && vim_strchr((char_u *)"|\"\n", *arg) == NULL)
+ if (*arg == NUL ||
+ vim_strchr((char_u *)"|\"\n", *arg) == NULL)
xp->xp_context = EXPAND_NOTHING;
else
return arg;
@@ -2408,6 +2414,8 @@
int len = (int)STRLEN(pat) + 20;
tofree = alloc(len);
+ if (tofree == NULL)
+ return FAIL;
vim_snprintf((char *)tofree, len, "^<SNR>\\d\\+_%s", pat + 3);
pat = tofree;
}