Mercurial > vim
changeset 29645:9cd050914eb6 v9.0.0163
patch 9.0.0163: text property not adjusted for text inserted with "p"
Commit: https://github.com/vim/vim/commit/ecb00c7b613b92ffb628a5a7f303ba06780288ad
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 7 14:55:14 2022 +0100
patch 9.0.0163: text property not adjusted for text inserted with "p"
Problem: Text property not adjusted for text inserted with "p".
Solution: Adjust column and length of text properties.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 07 Aug 2022 16:00:06 +0200 |
| parents | b73d91f287ae |
| children | 27333a2163d4 |
| files | src/register.c src/testdir/test_textprop.vim src/version.c |
| diffstat | 3 files changed, 34 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/register.c +++ b/src/register.c @@ -2101,6 +2101,8 @@ do_put( STRMOVE(ptr, oldp + col); ml_replace(lnum, newp, FALSE); + inserted_bytes(lnum, col, totlen); + // compute the byte offset for the last character first_byte_off = mb_head_off(newp, ptr - 1); @@ -2128,7 +2130,6 @@ do_put( ++curwin->w_cursor.col; else curwin->w_cursor.col -= first_byte_off; - changed_bytes(lnum, col); } else {
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -658,6 +658,36 @@ func Test_prop_open_line() set bs& endfunc +func Test_prop_put() + new + let expected = SetupOneLine() " 'xonex xtwoxx' + + let @a = 'new' + " insert just after the prop + normal 03l"ap + " insert inside the prop + normal 02l"ap + " insert just before the prop + normal 0"ap + + call assert_equal('xnewonnewenewx xtwoxx', getline(1)) + let expected[0].col += 3 + let expected[0].length += 3 + let expected[1].col += 9 + call assert_equal(expected, prop_list(1)) + + " Visually select 4 chars in the prop and put "AB" to replace them + let @a = 'AB' + normal 05lv3l"ap + call assert_equal('xnewoABenewx xtwoxx', getline(1)) + let expected[0].length -= 2 + let expected[1].col -= 2 + call assert_equal(expected, prop_list(1)) + + call DeletePropTypes() + bwipe! +endfunc + func Test_prop_clear() new call AddPropTypes()