Skip to content

Commit

Permalink
patch 8.2.4717: for TextYankPost v:event does not contain all informa…
Browse files Browse the repository at this point in the history
…tion

Problem:    For TextYankPost v:event does not contain information about the
            operation being inclusive or not.
Solution:   Add "inclusive" to v:event. (Justn M. Keyes, Yegappan Lakshmanan,
            closes #10125)
  • Loading branch information
brammool committed Apr 9, 2022
1 parent 7c7e19c commit a016eeb
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 16 deletions.
3 changes: 3 additions & 0 deletions runtime/doc/autocmd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,9 @@ TextYankPost After text has been yanked or deleted in the
current buffer. The following values of
|v:event| can be used to determine the operation
that triggered this autocmd:
inclusive TRUE if the motion is
|inclusive| else the motion is
|exclusive|.
operator The operation performed.
regcontents Text that was stored in the
register, as a list of lines,
Expand Down
9 changes: 9 additions & 0 deletions src/register.c
Original file line number Diff line number Diff line change
Expand Up @@ -1013,20 +1013,28 @@ yank_do_autocmd(oparg_T *oap, yankreg_T *reg)
list = list_alloc();
if (list == NULL)
return;

// yanked text contents
for (n = 0; n < reg->y_size; n++)
list_append_string(list, reg->y_array[n], -1);
list->lv_lock = VAR_FIXED;
(void)dict_add_list(v_event, "regcontents", list);

// register name or empty string for unnamed operation
buf[0] = (char_u)oap->regname;
buf[1] = NUL;
(void)dict_add_string(v_event, "regname", buf);

// motion type: inclusive or exclusive
(void)dict_add_bool(v_event, "inclusive", oap->inclusive);

// kind of operation (yank, delete, change)
buf[0] = get_op_char(oap->op_type);
buf[1] = get_extra_op_char(oap->op_type);
buf[2] = NUL;
(void)dict_add_string(v_event, "operator", buf);

// register type
buf[0] = NUL;
buf[1] = NUL;
switch (get_reg_type(oap->regname, &reglen))
Expand All @@ -1040,6 +1048,7 @@ yank_do_autocmd(oparg_T *oap, yankreg_T *reg)
}
(void)dict_add_string(v_event, "regtype", buf);

// selection type - visual or not
(void)dict_add_bool(v_event, "visual", oap->is_VIsual);

// Lock the dictionary and its keys
Expand Down
54 changes: 38 additions & 16 deletions src/testdir/test_autocmd.vim
Original file line number Diff line number Diff line change
Expand Up @@ -1931,28 +1931,48 @@ func Test_TextYankPost()

norm "ayiw
call assert_equal(
\{'regcontents': ['foo'], 'regname': 'a', 'operator': 'y', 'regtype': 'v', 'visual': v:false},
\g:event)
\ #{regcontents: ['foo'], regname: 'a', operator: 'y',
\ regtype: 'v', visual: v:false, inclusive: v:true},
\ g:event)
norm y_
call assert_equal(
\{'regcontents': ['foo'], 'regname': '', 'operator': 'y', 'regtype': 'V', 'visual': v:false},
\g:event)
\ #{regcontents: ['foo'], regname: '', operator: 'y', regtype: 'V',
\ visual: v:false, inclusive: v:false},
\ g:event)
norm Vy
call assert_equal(
\{'regcontents': ['foo'], 'regname': '', 'operator': 'y', 'regtype': 'V', 'visual': v:true},
\g:event)
\ #{regcontents: ['foo'], regname: '', operator: 'y', regtype: 'V',
\ visual: v:true, inclusive: v:true},
\ g:event)
call feedkeys("\<C-V>y", 'x')
call assert_equal(
\{'regcontents': ['f'], 'regname': '', 'operator': 'y', 'regtype': "\x161", 'visual': v:true},
\g:event)
\ #{regcontents: ['f'], regname: '', operator: 'y', regtype: "\x161",
\ visual: v:true, inclusive: v:true},
\ g:event)
norm "xciwbar
call assert_equal(
\{'regcontents': ['foo'], 'regname': 'x', 'operator': 'c', 'regtype': 'v', 'visual': v:false},
\g:event)
\ #{regcontents: ['foo'], regname: 'x', operator: 'c', regtype: 'v',
\ visual: v:false, inclusive: v:true},
\ g:event)
norm "bdiw
call assert_equal(
\{'regcontents': ['bar'], 'regname': 'b', 'operator': 'd', 'regtype': 'v', 'visual': v:false},
\g:event)
\ #{regcontents: ['bar'], regname: 'b', operator: 'd', regtype: 'v',
\ visual: v:false, inclusive: v:true},
\ g:event)

call setline(1, 'foobar')
" exclusive motion
norm $"ay0
call assert_equal(
\ #{regcontents: ['fooba'], regname: 'a', operator: 'y', regtype: 'v',
\ visual: v:false, inclusive: v:false},
\ g:event)
" inclusive motion
norm 0"ay$
call assert_equal(
\ #{regcontents: ['foobar'], regname: 'a', operator: 'y', regtype: 'v',
\ visual: v:false, inclusive: v:true},
\ g:event)

call assert_equal({}, v:event)

Expand All @@ -1965,15 +1985,17 @@ func Test_TextYankPost()
set clipboard=autoselect
exe "norm! ggviw\<Esc>"
call assert_equal(
\{'regcontents': ['foobar'], 'regname': '*', 'operator': 'y', 'regtype': 'v', 'visual': v:true},
\g:event)
\ #{regcontents: ['foobar'], regname: '*', operator: 'y',
\ regtype: 'v', visual: v:true, inclusive: v:false},
\ g:event)

let @+ = ''
set clipboard=autoselectplus
exe "norm! ggviw\<Esc>"
call assert_equal(
\{'regcontents': ['foobar'], 'regname': '+', 'operator': 'y', 'regtype': 'v', 'visual': v:true},
\g:event)
\ #{regcontents: ['foobar'], regname: '+', operator: 'y',
\ regtype: 'v', visual: v:true, inclusive: v:false},
\ g:event)

set clipboard&vim
endif
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4717,
/**/
4716,
/**/
Expand Down

0 comments on commit a016eeb

Please sign in to comment.