diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-08-18 21:05:31 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-08-18 21:05:31 +0200 |
| commit | 264cf5cfaf40e704aea2578e70c15ed9a9d0161e (patch) | |
| tree | 0cc382c062de9fd17d9a8228829c526a03674973 /src/ex_getln.c | |
| parent | 3b9fcfcffab8f927a01877804fa6ac5bbca34c7a (diff) | |
patch 8.1.0295: no 'incsearch' highlighting for :vimgrep and similarv8.1.0295
Problem: No 'incsearch' highlighting for :vimgrep and similar commands.
Solution: Parse the :vimgrep command and similar ones to locate the search
pattern. (Hirohito Higashi, closes #3344)
Diffstat (limited to 'src/ex_getln.c')
| -rw-r--r-- | src/ex_getln.c | 80 |
1 files changed, 52 insertions, 28 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 7928af7bff..bce4aac790 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -307,49 +307,73 @@ do_incsearch_highlighting(int firstc, incsearch_state_T *is_state, cmdmod = save_cmdmod; cmd = skip_range(ea.cmd, NULL); - if (*cmd == 's' || *cmd == 'g' || *cmd == 'v') + if (*cmd == 's' || *cmd == 'g' || *cmd == 'v' || *cmd == 'l') { // Skip over "substitute" to find the pattern separator. for (p = cmd; ASCII_ISALPHA(*p); ++p) ; - if (*skipwhite(p) != NUL - && (STRNCMP(cmd, "substitute", p - cmd) == 0 - || STRNCMP(cmd, "smagic", p - cmd) == 0 - || STRNCMP(cmd, "snomagic", MAX(p - cmd, 3)) == 0 - || STRNCMP(cmd, "sort", p - cmd) == 0 - || STRNCMP(cmd, "global", p - cmd) == 0 - || STRNCMP(cmd, "vglobal", p - cmd) == 0)) + if (*skipwhite(p) != NUL) { - if (*cmd == 's' && cmd[1] == 'm') - p_magic = TRUE; - else if (*cmd == 's' && cmd[1] == 'n') - p_magic = FALSE; + if (STRNCMP(cmd, "substitute", p - cmd) == 0 + || STRNCMP(cmd, "smagic", p - cmd) == 0 + || STRNCMP(cmd, "snomagic", MAX(p - cmd, 3)) == 0 + || STRNCMP(cmd, "sort", MAX(p - cmd, 3)) == 0 + || STRNCMP(cmd, "global", p - cmd) == 0 + || STRNCMP(cmd, "vglobal", p - cmd) == 0) + { + if (*cmd == 's' && cmd[1] == 'm') + p_magic = TRUE; + else if (*cmd == 's' && cmd[1] == 'n') + p_magic = FALSE; + + // Check for "global!/". + if (*cmd == 'g' && *p == '!') + { + p++; + if (*skipwhite(p) == NUL) + return FALSE; + } + + // For ":sort" skip over flags. + if (cmd[0] == 's' && cmd[1] == 'o') + { + while (ASCII_ISALPHA(*(p = skipwhite(p)))) + ++p; + if (*p == NUL) + return FALSE; + } - // Check for "global!/". - if (*cmd == 'g' && *p == '!') + p = skipwhite(p); + delim = *p++; + end = skip_regexp(p, delim, p_magic, NULL); + } + else if (STRNCMP(cmd, "vimgrep", MAX(p - cmd, 3)) == 0 + || STRNCMP(cmd, "vimgrepadd", MAX(p - cmd, 8)) == 0 + || STRNCMP(cmd, "lvimgrep", MAX(p - cmd, 2)) == 0 + || STRNCMP(cmd, "lvimgrepadd", MAX(p - cmd, 9)) == 0) { - p++; - if (*skipwhite(p) == NUL) - return FALSE; + // Check for "!/". + if (*p == '!') + { + p++; + if (*skipwhite(p) == NUL) + return FALSE; + } + p = skipwhite(p); + delim = (vim_isIDc(*p)) ? ' ' : *p++; + end = skip_regexp(p, delim, p_magic, NULL); } - - // For ":sort" skip over flags. - if (cmd[0] == 's' && cmd[1] == 'o') + else { - while (ASCII_ISALPHA(*(p = skipwhite(p)))) - ++p; - if (*p == NUL) - return FALSE; + end = p; + delim = -1; } - p = skipwhite(p); - delim = *p++; - end = skip_regexp(p, delim, p_magic, NULL); if (end > p || *end == delim) { pos_T save_cursor = curwin->w_cursor; - // found a non-empty pattern + // found a non-empty pattern or // *skiplen = (int)(p - ccline.cmdbuff); *patlen = (int)(end - p); |