Mercurial > vim
changeset 14556:2bee637a8edc v8.1.0291
patch 8.1.0291: 'incsearch' highlighting not used for :sort
commit https://github.com/vim/vim/commit/81f56536b1bc324eb173924a8cf4d7dbbf4f3fdb
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 18 16:19:42 2018 +0200
patch 8.1.0291: 'incsearch' highlighting not used for :sort
Problem: 'incsearch' highlighting not used for :sort.
Solution: Handle pattern in :sort command.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 18 Aug 2018 16:30:04 +0200 |
| parents | b8dad604cb54 |
| children | 86147c8ef88c |
| files | src/ex_getln.c src/testdir/dumps/Test_incsearch_sort_01.dump src/testdir/test_search.vim src/version.c |
| diffstat | 4 files changed, 50 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -316,6 +316,7 @@ do_incsearch_highlighting(int firstc, in && (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)) { @@ -331,6 +332,16 @@ do_incsearch_highlighting(int firstc, in 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; + } + p = skipwhite(p); delim = *p++; end = skip_regexp(p, delim, p_magic, NULL); @@ -359,7 +370,7 @@ do_incsearch_highlighting(int firstc, in 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;
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_incsearch_sort_01.dump @@ -0,0 +1,9 @@ +|a+0&#ffffff0|n|o|t|h|e|r| |o+1&&|n|e+0&&| |2| @56 +|t|h|a|t| |o+0&#ffff4012|n|e+0&#ffffff0| |3| @59 +|t|h|e| |o+0&#ffff4012|n|e+0&#ffffff0| |1| @60 +|~+0#4040ff13&| @68 +|~| @68 +|~| @68 +|~| @68 +|~| @68 +|:+0#0000000&|s|o|r|t| |n|i| |u| |/|o|n> @55
--- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -917,6 +917,33 @@ func Test_incsearch_substitute_dump() call delete('Xis_subst_script') endfunc +" Similar to Test_incsearch_substitute_dump() for :sort +func Test_incsearch_ssort_dump() + if !exists('+incsearch') + return + endif + if !CanRunVimInTerminal() + return + endif + call writefile([ + \ 'set incsearch hlsearch scrolloff=0', + \ 'call setline(1, ["another one 2", "that one 3", "the one 1"])', + \ ], 'Xis_sort_script') + let buf = RunVimInTerminal('-S Xis_sort_script', {'rows': 9, 'cols': 70}) + " Give Vim a chance to redraw to get rid of the spaces in line 2 caused by + " the 'ambiwidth' check. + sleep 100m + + " Need to send one key at a time to force a redraw. + call term_sendkeys(buf, ':sort ni u /on') + sleep 100m + call VerifyScreenDump(buf, 'Test_incsearch_sort_01', {}) + call term_sendkeys(buf, "\<Esc>") + + call StopVimInTerminal(buf) + call delete('Xis_sort_script') +endfunc + func Test_search_undefined_behaviour() if !has("terminal") return