aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.1.2221: cannot filter :disp output

Browse Source 
Problem:    Cannot filter :disp output.
Solution:   Support filtereing :disp output. (Andi Massimino, closes #5117)
This commit is contained in:
Bram Moolenaar
2019-10-26 17:33:13 +02:00
parent 6a0cc916bd
commit 8fc4296436
4 changed files with 76 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/various.txt
View File

@@ -575,6 +575,8 @@ N *+X11* Unix only: can restore window title |X11|
|:marks| - filter by text in the current file,
or file name for other files
|:oldfiles| - filter by file name
|:registers| - filter by register contents
(does not work multi-line)
|:set| - filter by variable name
Only normal messages are filtered, error messages are

37
src/register.c
View File

@@ -2161,7 +2161,7 @@ ex_display(exarg_T *eap)
int attr;
char_u *arg = eap->arg;
int clen;
char_u type[2];
int type;
if (arg != NULL && *arg == NUL)
arg = NULL;
@@ -2174,9 +2174,9 @@ ex_display(exarg_T *eap)
name = get_register_name(i);
switch (get_reg_type(name, NULL))
{
case MLINE: type[0] = 'l'; break;
case MCHAR: type[0] = 'c'; break;
default: type[0] = 'b'; break;
case MLINE: type = 'l'; break;
case MCHAR: type = 'c'; break;
default: type = 'b'; break;
}
if (arg != NULL && vim_strchr(arg, name) == NULL
#ifdef ONE_CLIPBOARD
@@ -2212,10 +2212,17 @@ ex_display(exarg_T *eap)
#endif
if (yb->y_array != NULL)
{
int do_show = FALSE;
for (j = 0; !do_show && j < yb->y_size; ++j)
do_show = !message_filtered(yb->y_array[j]);
if (do_show || yb->y_size == 0)
{
msg_putchar('\n');
msg_puts(" ");
msg_putchar(type[0]);
msg_putchar(type);
msg_puts(" ");
msg_putchar('"');
msg_putchar(name);
@@ -2229,7 +2236,8 @@ ex_display(exarg_T *eap)
msg_puts_attr("^J", attr);
n -= 2;
}
for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p)
for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0;
++p)
{
clen = (*mb_ptr2len)(p);
msg_outtrans_len(p, clen);
@@ -2242,10 +2250,12 @@ ex_display(exarg_T *eap)
}
ui_breakcheck();
}
}
// display last inserted text
if ((p = get_last_insert()) != NULL
&& (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int)
&& (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int
&& !message_filtered(p))
{
msg_puts("\n c \". ");
dis_msg(p, TRUE);
@@ -2253,7 +2263,7 @@ ex_display(exarg_T *eap)
// display last command line
if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL)
&& !got_int)
&& !got_int && !message_filtered(last_cmdline))
{
msg_puts("\n c \": ");
dis_msg(last_cmdline, FALSE);
@@ -2261,7 +2271,8 @@ ex_display(exarg_T *eap)
// display current file name
if (curbuf->b_fname != NULL
&& (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int)
&& (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int
&& !message_filtered(curbuf->b_fname))
{
msg_puts("\n c \"% ");
dis_msg(curbuf->b_fname, FALSE);
@@ -2273,7 +2284,8 @@ ex_display(exarg_T *eap)
char_u *fname;
linenr_T dummy;
if (buflist_name_nr(0, &fname, &dummy) != FAIL)
if (buflist_name_nr(0, &fname, &dummy) != FAIL
&& !message_filtered(fname))
{
msg_puts("\n c \"# ");
dis_msg(fname, FALSE);
@@ -2282,7 +2294,8 @@ ex_display(exarg_T *eap)
// display last search pattern
if (last_search_pat() != NULL
&& (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int)
&& (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int
&& !message_filtered(last_search_pat()))
{
msg_puts("\n c \"/ ");
dis_msg(last_search_pat(), FALSE);
@@ -2291,7 +2304,7 @@ ex_display(exarg_T *eap)
#ifdef FEAT_EVAL
// display last used expression
if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL)
&& !got_int)
&& !got_int && !message_filtered(expr_line))
{
msg_puts("\n c \"= ");
dis_msg(expr_line, FALSE);

27
src/testdir/test_filter_cmd.vim
View File

@@ -145,3 +145,30 @@ func Test_filter_commands()
bwipe! file.h
bwipe! file.hs
endfunc
func Test_filter_display()
edit Xdoesnotmatch
let @a = '!!willmatch'
let @b = '!!doesnotmatch'
let @c = "oneline\ntwoline\nwillmatch\n"
let @/ = '!!doesnotmatch'
call feedkeys(":echo '!!doesnotmatch:'\<CR>", 'ntx')
let lines = map(split(execute('filter /willmatch/ display'), "\n"), 'v:val[5:6]')
call assert_true(index(lines, '"a') >= 0)
call assert_false(index(lines, '"b') >= 0)
call assert_true(index(lines, '"c') >= 0)
call assert_false(index(lines, '"/') >= 0)
call assert_false(index(lines, '":') >= 0)
call assert_false(index(lines, '"%') >= 0)
let lines = map(split(execute('filter /doesnotmatch/ display'), "\n"), 'v:val[5:6]')
call assert_true(index(lines, '"a') < 0)
call assert_false(index(lines, '"b') < 0)
call assert_true(index(lines, '"c') < 0)
call assert_false(index(lines, '"/') < 0)
call assert_false(index(lines, '":') < 0)
call assert_false(index(lines, '"%') < 0)
bwipe!
endfunc

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2221,
/**/
2220,
/**/