mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 9.1.0439: Cannot filter the history
Problem: Cannot filter the history Solution: Implement :filter :history closes: #14835 Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
*various.txt* For Vim version 9.1. Last change: 2023 Sep 27
|
*various.txt* For Vim version 9.1. Last change: 2024 May 23
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@@ -608,6 +608,7 @@ N *+X11* Unix only: can restore window title |X11|
|
|||||||
|:command| - filter by command name
|
|:command| - filter by command name
|
||||||
|:files| - filter by file name
|
|:files| - filter by file name
|
||||||
|:highlight| - filter by highlight group
|
|:highlight| - filter by highlight group
|
||||||
|
|:history| - filter by history commands
|
||||||
|:jumps| - filter by file name
|
|:jumps| - filter by file name
|
||||||
|:let| - filter by variable name
|
|:let| - filter by variable name
|
||||||
|:list| - filter whole line
|
|:list| - filter whole line
|
||||||
|
@@ -767,7 +767,8 @@ ex_history(exarg_T *eap)
|
|||||||
if (i == hislen)
|
if (i == hislen)
|
||||||
i = 0;
|
i = 0;
|
||||||
if (hist[i].hisstr != NULL
|
if (hist[i].hisstr != NULL
|
||||||
&& hist[i].hisnum >= j && hist[i].hisnum <= k)
|
&& hist[i].hisnum >= j && hist[i].hisnum <= k
|
||||||
|
&& !message_filtered(hist[i].hisstr))
|
||||||
{
|
{
|
||||||
msg_putchar('\n');
|
msg_putchar('\n');
|
||||||
sprintf((char *)IObuff, "%c%6d ", i == idx ? '>' : ' ',
|
sprintf((char *)IObuff, "%c%6d ", i == idx ? '>' : ' ',
|
||||||
|
@@ -96,6 +96,60 @@ function Test_History()
|
|||||||
call assert_fails('history xyz', 'E488:')
|
call assert_fails('history xyz', 'E488:')
|
||||||
call assert_fails('history ,abc', 'E488:')
|
call assert_fails('history ,abc', 'E488:')
|
||||||
call assert_fails('call histdel(":", "\\%(")', 'E53:')
|
call assert_fails('call histdel(":", "\\%(")', 'E53:')
|
||||||
|
|
||||||
|
" Test for filtering the history list
|
||||||
|
let hist_filter = execute(':filter /_\d/ :history all')->split('\n')
|
||||||
|
call assert_equal(20, len(hist_filter))
|
||||||
|
let expected = [' # cmd history',
|
||||||
|
\ ' 2 text_2',
|
||||||
|
\ ' 3 text_3',
|
||||||
|
\ '> 4 text_4',
|
||||||
|
\ ' # search history',
|
||||||
|
\ ' 2 text_2',
|
||||||
|
\ ' 3 text_3',
|
||||||
|
\ '> 4 text_4',
|
||||||
|
\ ' # expr history',
|
||||||
|
\ ' 2 text_2',
|
||||||
|
\ ' 3 text_3',
|
||||||
|
\ '> 4 text_4',
|
||||||
|
\ ' # input history',
|
||||||
|
\ ' 2 text_2',
|
||||||
|
\ ' 3 text_3',
|
||||||
|
\ '> 4 text_4',
|
||||||
|
\ ' # debug history',
|
||||||
|
\ ' 2 text_2',
|
||||||
|
\ ' 3 text_3',
|
||||||
|
\ '> 4 text_4']
|
||||||
|
call assert_equal(expected, hist_filter)
|
||||||
|
|
||||||
|
let cmds = {'c': 'cmd', 's': 'search', 'e': 'expr', 'i': 'input', 'd': 'debug'}
|
||||||
|
for h in sort(keys(cmds))
|
||||||
|
" find some items
|
||||||
|
let hist_filter = execute(':filter /_\d/ :history ' .. h)->split('\n')
|
||||||
|
call assert_equal(4, len(hist_filter))
|
||||||
|
|
||||||
|
let expected = [' # ' .. cmds[h] .. ' history',
|
||||||
|
\ ' 2 text_2',
|
||||||
|
\ ' 3 text_3',
|
||||||
|
\ '> 4 text_4']
|
||||||
|
call assert_equal(expected, hist_filter)
|
||||||
|
|
||||||
|
" Search for an item that is not there
|
||||||
|
let hist_filter = execute(':filter /XXXX/ :history ' .. h)->split('\n')
|
||||||
|
call assert_equal(1, len(hist_filter))
|
||||||
|
|
||||||
|
let expected = [' # ' .. cmds[h] .. ' history']
|
||||||
|
call assert_equal(expected, hist_filter)
|
||||||
|
|
||||||
|
" Invert the filter condition, find non-matches
|
||||||
|
let hist_filter = execute(':filter! /_3$/ :history ' .. h)->split('\n')
|
||||||
|
call assert_equal(3, len(hist_filter))
|
||||||
|
|
||||||
|
let expected = [' # ' .. cmds[h] .. ' history',
|
||||||
|
\ ' 2 text_2',
|
||||||
|
\ '> 4 text_4']
|
||||||
|
call assert_equal(expected, hist_filter)
|
||||||
|
endfor
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function Test_history_truncates_long_entry()
|
function Test_history_truncates_long_entry()
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
439,
|
||||||
/**/
|
/**/
|
||||||
438,
|
438,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user