mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 15:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0291: 'incsearch' highlighting not used for :sort

Browse Source 
Problem:    'incsearch' highlighting not used for :sort.
Solution:   Handle pattern in :sort command.
81f56536b1
This commit is contained in:
Aufar Gilbran
2020-08-19 00:49:38 +08:00
parent c0102c140c
commit ab7e101540
3 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/ex_getln.c
View File

@@ -314,6 +314,7 @@ static bool do_incsearch_highlighting(int firstc, incsearch_state_T *s,
&& (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 (*cmd == 's' && cmd[1] == 'm') {
@@ -330,6 +331,17 @@ static bool do_incsearch_highlighting(int firstc, incsearch_state_T *s,
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;
}
}
p = skipwhite(p);
delim = *p++;
end = skip_regexp(p, delim, p_magic, NULL);
@@ -352,7 +364,7 @@ static bool do_incsearch_highlighting(int firstc, incsearch_state_T *s,
search_first_line = ea.line1;
search_last_line = ea.line2;
}
} else if (*cmd == 's') {
} else if (cmd[0] == 's' && cmd[1] != 'o') {
// :s defaults to the current line
search_first_line = curwin->w_cursor.lnum;
search_last_line = curwin->w_cursor.lnum;