IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2221: cannot filter :disp output

Browse Source 
Problem:    Cannot filter :disp output.
Solution:   Support filtereing :disp output. (Andi Massimino, closes vim/vim#5117)
8fc4296436
This commit is contained in:
zeertzjq 2022-02-10 07:28:54 +08:00
parent 90f2a851c7
commit aea889fc06
3 changed files with 77 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/various.txt
View File

@ -388,6 +388,8 @@ g8 Print the hex values of the bytes used in the
|: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 option name
Only normal messages are filtered, error messages are

97
src/nvim/ops.c
View File

@ -3732,7 +3732,7 @@ void ex_display(exarg_T *eap)
int name;
char_u *arg = eap->arg;
int clen;
char_u type[2];
int type;
if (arg != NULL && *arg == NUL) {
arg = NULL;
@ -3745,11 +3745,11 @@ void ex_display(exarg_T *eap)
name = get_register_name(i);
switch (get_reg_type(name, NULL)) {
case kMTLineWise:
type[0] = 'l'; break;
type = 'l'; break;
case kMTCharWise:
type[0] = 'c'; break;
type = 'c'; break;
default:
type[0] = 'b'; break;
type = 'b'; break;
}
if (arg != NULL && vim_strchr(arg, name) == NULL) {
@ -3776,88 +3776,87 @@ void ex_display(exarg_T *eap)
}
if (yb->y_array != NULL) {
msg_putchar('\n');
msg_puts(" ");
msg_putchar(type[0]);
msg_puts(" ");
msg_putchar('"');
msg_putchar(name);
msg_puts(" ");
bool do_show = false;
int n = Columns - 11;
for (size_t j = 0; j < yb->y_size && n > 1; j++) {
if (j) {
for (size_t 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);
msg_puts(" ");
msg_putchar('"');
msg_putchar(name);
msg_puts(" ");
int n = Columns - 11;
for (size_t j = 0; j < yb->y_size && n > 1; j++) {
if (j) {
msg_puts_attr("^J", attr);
n -= 2;
}
for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; p++) {
clen = utfc_ptr2len(p);
msg_outtrans_len(p, clen);
p += clen - 1;
}
}
if (n > 1 && yb->y_type == kMTLineWise) {
msg_puts_attr("^J", attr);
n -= 2;
}
for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; p++) { // -V1019 NOLINT(whitespace/line_length)
clen = utfc_ptr2len(p);
msg_outtrans_len(p, clen);
p += clen - 1;
}
ui_flush(); // show one line at a time
}
if (n > 1 && yb->y_type == kMTLineWise) {
msg_puts_attr("^J", attr);
}
ui_flush(); // show one line at a time
os_breakcheck();
}
os_breakcheck();
}
/*
* display last inserted text
*/
// 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);
}
/*
* display last command line
*/
// 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);
}
/*
* display current file name
*/
// 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);
}
/*
* display alternate file name
*/
// display alternate file name
if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) {
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);
}
}
/*
* display last search pattern
*/
// 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);
}
/*
* display last used expression
*/
// 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/nvim/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