mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-17 08:48:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2212: cannot see the selection type in :reg output

Browse Source 
Problem:    Cannot see the selection type in :reg output. (Ayberk Aydın)
Solution:   Add c/l/b. (Christian Brabandt, closes vim/vim#5110, closes vim/vim#4546)
3691f1ee72

Patch v8.1.0999 is not ported so ":registers" does not omit register 1.
This commit is contained in:
Jan Edmund Lazo
2020-12-24 23:00:58 -05:00
parent 0813bb021a
commit 8cf4a02bf2
4 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/doc/change.txt
View File

@@ -954,9 +954,13 @@ inside of strings can change! Also see 'softtabstop' option. >
delete and yank) ({.%#:} only work with put). delete and yank) ({.%#:} only work with put).
*:reg* *:registers* *:reg* *:registers*
:reg[isters] Display the contents of all numbered and named :reg[isters] Display the type and contents of all numbered and
registers. If a register is written to for |:redir| named registers. If a register is written to for
it will not be listed. |:redir| it will not be listed.
Type can be one of:
"c" for |characterwise| text
"l" for |linewise| text
"b" for |blockwise-visual| text
:reg[isters] {arg} Display the contents of the numbered and named :reg[isters] {arg} Display the contents of the numbered and named

44
src/nvim/ops.c
View File

@@ -3554,15 +3554,21 @@ void ex_display(exarg_T *eap)
int name; int name;
char_u *arg = eap->arg; char_u *arg = eap->arg;
int clen; int clen;
char_u type[2];
if (arg != NULL && *arg == NUL) if (arg != NULL && *arg == NUL)
arg = NULL; arg = NULL;
int attr = HL_ATTR(HLF_8); int attr = HL_ATTR(HLF_8);
/* Highlight title */ // Highlight title
MSG_PUTS_TITLE(_("\n--- Registers ---")); msg_puts_title(_("\nType Name Content"));
for (int i = -1; i < NUM_REGISTERS && !got_int; i++) { for (int i = -1; i < NUM_REGISTERS && !got_int; i++) {
name = get_register_name(i); name = get_register_name(i);
switch (get_reg_type(name, NULL)) {
case kMTLineWise: type[0] = 'l'; break;
case kMTCharWise: type[0] = 'c'; break;
default: type[0] = 'b'; break;
}
if (arg != NULL && vim_strchr(arg, name) == NULL) { if (arg != NULL && vim_strchr(arg, name) == NULL) {
continue; /* did not ask for this register */ continue; /* did not ask for this register */
@@ -3587,11 +3593,14 @@ void ex_display(exarg_T *eap)
if (yb->y_array != NULL) { if (yb->y_array != NULL) {
msg_putchar('\n'); msg_putchar('\n');
msg_puts(" ");
msg_putchar(type[0]);
msg_puts(" ");
msg_putchar('"'); msg_putchar('"');
msg_putchar(name); msg_putchar(name);
MSG_PUTS(" "); MSG_PUTS(" ");
int n = Columns - 6; int n = Columns - 11;
for (size_t j = 0; j < yb->y_size && n > 1; j++) { for (size_t j = 0; j < yb->y_size && n > 1; j++) {
if (j) { if (j) {
MSG_PUTS_ATTR("^J", attr); MSG_PUTS_ATTR("^J", attr);
@@ -3616,8 +3625,8 @@ void ex_display(exarg_T *eap)
*/ */
if ((p = get_last_insert()) != NULL if ((p = get_last_insert()) != NULL
&& (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) { && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) {
MSG_PUTS("\n\". "); msg_puts("\n c \". ");
dis_msg(p, TRUE); dis_msg(p, true);
} }
/* /*
@@ -3625,8 +3634,8 @@ void ex_display(exarg_T *eap)
*/ */
if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL)
&& !got_int) { && !got_int) {
MSG_PUTS("\n\": "); msg_puts("\n c \": ");
dis_msg(last_cmdline, FALSE); dis_msg(last_cmdline, false);
} }
/* /*
@@ -3634,8 +3643,8 @@ void ex_display(exarg_T *eap)
*/ */
if (curbuf->b_fname != NULL if (curbuf->b_fname != NULL
&& (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) { && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) {
MSG_PUTS("\n\"% "); msg_puts("\n c \"% ");
dis_msg(curbuf->b_fname, FALSE); dis_msg(curbuf->b_fname, false);
} }
/* /*
@@ -3646,8 +3655,8 @@ void ex_display(exarg_T *eap)
linenr_T dummy; linenr_T dummy;
if (buflist_name_nr(0, &fname, &dummy) != FAIL) { if (buflist_name_nr(0, &fname, &dummy) != FAIL) {
MSG_PUTS("\n\"# "); msg_puts("\n c \"# ");
dis_msg(fname, FALSE); dis_msg(fname, false);
} }
} }
@@ -3656,8 +3665,8 @@ void ex_display(exarg_T *eap)
*/ */
if (last_search_pat() != NULL if (last_search_pat() != NULL
&& (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) { && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) {
MSG_PUTS("\n\"/ "); msg_puts("\n c \"/ ");
dis_msg(last_search_pat(), FALSE); dis_msg(last_search_pat(), false);
} }
/* /*
@@ -3665,8 +3674,8 @@ void ex_display(exarg_T *eap)
*/ */
if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL)
&& !got_int) { && !got_int) {
MSG_PUTS("\n\"= "); msg_puts("\n c \"= ");
dis_msg(expr_line, FALSE); dis_msg(expr_line, false);
} }
} }
@@ -3676,9 +3685,10 @@ void ex_display(exarg_T *eap)
*/ */
static void static void
dis_msg( dis_msg(
char_u *p, const char_u *p,
int skip_esc /* if TRUE, ignore trailing ESC */ bool skip_esc // if true, ignore trailing ESC
) )
FUNC_ATTR_NONNULL_ALL
{ {
int n; int n;
int l; int l;

30
src/nvim/testdir/test_registers.vim
View File

@@ -52,27 +52,27 @@ func Test_display_registers()
let b = execute('registers') let b = execute('registers')
call assert_equal(a, b) call assert_equal(a, b)
call assert_match('^\n--- Registers ---\n' call assert_match('^\nType Name Content\n'
\ . '"" a\n' \ . ' c "" a\n'
\ . '"0 ba\n' \ . ' c "0 ba\n'
\ . '"1 b\n' \ . ' c "1 b\n'
\ . '"a b\n' \ . ' c "a b\n'
\ . '.*' \ . '.*'
\ . '"- a\n' \ . ' c "- a\n'
\ . '.*' \ . '.*'
\ . '": ls\n' \ . ' c ": ls\n'
\ . '"% file2\n' \ . ' c "% file2\n'
\ . '"# file1\n' \ . ' c "# file1\n'
\ . '"/ bar\n' \ . ' c "/ bar\n'
\ . '"= 2\*4', a) \ . ' c "= 2\*4', a)
let a = execute('registers a') let a = execute('registers a')
call assert_match('^\n--- Registers ---\n' call assert_match('^\nType Name Content\n'
\ . '"a b', a) \ . ' c "a b', a)
let a = execute('registers :') let a = execute('registers :')
call assert_match('^\n--- Registers ---\n' call assert_match('^\nType Name Content\n'
\ . '": ls', a) \ . ' c ": ls', a)
bwipe! bwipe!
endfunc endfunc

8
test/functional/provider/clipboard_spec.lua
View File

@@ -605,10 +605,10 @@ describe('clipboard (with fake clipboard.vim)', function()
{0:~ }| {0:~ }|
{4: }| {4: }|
:registers | :registers |
{1:--- Registers ---} | {1:Type Name Content} |
"* some{2:^J}star data{2:^J} | l "* some{2:^J}star data{2:^J} |
"+ such{2:^J}plus{2:^J}stuff | c "+ such{2:^J}plus{2:^J}stuff |
": let g:test_clip['+'] = ['such', 'plus', 'stuff'] | c ": let g:test_clip['+'] = ['such', 'plus', 'stuff'] |
{3:Press ENTER or type command to continue}^ | {3:Press ENTER or type command to continue}^ |
]], { ]], {
[0] = {bold = true, foreground = Screen.colors.Blue}, [0] = {bold = true, foreground = Screen.colors.Blue},