Mercurial > vim
changeset 15347:f6b522596993 v8.1.0681
patch 8.1.0681: text properties as not adjusted for deleted text
commit https://github.com/vim/vim/commit/33c8ca923ed6d5638fa98afabb2e25b5056dd47b
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jan 2 18:00:27 2019 +0100
patch 8.1.0681: text properties as not adjusted for deleted text
Problem: Text properties as not adjusted for deleted text.
Solution: Adjust text properties when backspacing to delete text.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 02 Jan 2019 18:15:04 +0100 |
| parents | 139e53b295f8 |
| children | 24c31bd03f3a |
| files | src/edit.c src/misc1.c src/testdir/dumps/Test_textprop_01.dump src/testdir/test_textprop.vim src/version.c |
| diffstat | 5 files changed, 29 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/edit.c +++ b/src/edit.c @@ -6737,7 +6737,6 @@ internal_format( * comment leader for the numbered list. */ for (i = 0; i < padding; i++) ins_str((char_u *)" "); - changed_bytes(curwin->w_cursor.lnum, leader_len); } else {
--- a/src/misc1.c +++ b/src/misc1.c @@ -2749,7 +2749,7 @@ del_bytes( #endif // mark the buffer as changed and prepare for displaying - changed_bytes(lnum, curwin->w_cursor.col); + inserted_bytes(lnum, curwin->w_cursor.col, -count); return OK; }
--- a/src/testdir/dumps/Test_textprop_01.dump +++ b/src/testdir/dumps/Test_textprop_01.dump @@ -1,6 +1,6 @@ | +0#af5f00255#ffffff0@1|1| |O+0#0000000&|n|e| +0&#ffff4012|t|w|o| +0&#ffffff0@63 | +0#af5f00255&@1|2| |N+0#0000000#ffff4012|u|m|b|é|r| |1+0#4040ff13&|2|3| +0#0000000&|ä|n|d| |t|h|œ|n| |4+0#4040ff13&|¾|7|.+0#0000000&| +0&#ffffff0@46 -| +0#af5f00255&@1|3| |-+0#0000000#ffff4012@1|x+0&#ffffff0|a+0#4040ff13&@1|x+0#0000000&|-@1|x+0#4040ff13&|b@1|x+0#0000000&|-@1|x|c+0#4040ff13&@1|x|-+0#0000000&@1|x+0#4040ff13&|d@1>x|-+0#0000000&@1| @44 +| +0#af5f00255&@1|3| >-+0#0000000#ffff4012|x+0&#ffffff0|a+0#4040ff13&@1|x+0#0000000&|-@1|x+0#4040ff13&|b@1|x+0#0000000&|-@1|x|c+0#4040ff13&@1|x|-+0#0000000&@1|x+0#4040ff13&|d@1|x|-+0#0000000&@1| @45 |~+0#4040ff13&| @73 |~| @73 -| +0#0000000&@56|3|,|2|4| @9|A|l@1| +| +0#0000000&@56|3|,|1| @10|A|l@1|
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -177,6 +177,29 @@ func Test_prop_add_remove_buf() bwipe! endfunc +func Test_prop_backspace() + new + set bs=2 + call setline(1, 'xonex xtwoxx') + call AddPropTypes() + call prop_add(1, 2, {'length': 3, 'id': 11, 'type': 'one'}) + call prop_add(1, 8, {'length': 3, 'id': 12, 'type': 'two'}) + let expected = [ + \ {'col': 2, 'length': 3, 'id': 11, 'type': 'one', 'start': 1, 'end': 1}, + \ {'col': 8, 'length': 3, 'id': 12, 'type': 'two', 'start': 1, 'end': 1}, + \] + call assert_equal(expected, prop_list(1)) + + exe "normal 0li\<BS>\<Esc>fxli\<BS>\<Esc>" + call assert_equal('one xtwoxx', getline(1)) + let expected[0].col = 1 + let expected[1].col = 6 + call assert_equal(expected, prop_list(1)) + + call DeletePropTypes() + bwipe! + set bs& +endfunc func Test_prop_clear() new @@ -319,6 +342,7 @@ funct Test_textprop_screenshots() \ "hi clear SpellBad", \ "set spell", \ "normal 3G0llix\<Esc>lllix\<Esc>lllix\<Esc>lllix\<Esc>lllix\<Esc>lllix\<Esc>lllix\<Esc>lllix\<Esc>", + \ "normal 3G0lli\<BS>\<Esc>", \], 'XtestProp') let buf = RunVimInTerminal('-S XtestProp', {'rows': 6}) call VerifyScreenDump(buf, 'Test_textprop_01', {})