thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0681: text properties as not adjusted for deleted text

Browse Source 
Problem:    Text properties as not adjusted for deleted text.
Solution:   Adjust text properties when backspacing to delete text.
This commit is contained in:
Bram Moolenaar
2019-01-02 18:00:27 +01:00
parent c85ffc9dab
commit 33c8ca923e
5 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/edit.c
View File

@@ -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
{

2
src/misc1.c
View File

@@ -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;
}

4
src/testdir/dumps/Test_textprop_01.dump
View File

@@ -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|

24
src/testdir/test_textprop.vim
View File

@@ -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', {})

2
src/version.c
View File

@@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
681,
/**/
680,
/**/