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.

diff --git a/src/edit.c b/src/edit.c
index a522fe93bba6c9810a8c182512029245dde1b381..1b88f6140a0b1aa78506e1f2e6e90967de5d6c36 100644 (file)
--- 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
                    {

diff --git a/src/misc1.c b/src/misc1.c
index 692d5c769e9f177d1d69ffd90a80a548098168ff..c2d2d19d2f3c564f2eed084ae3da111cac7d99a2 100644 (file)
--- 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;
 }

diff --git a/src/testdir/dumps/Test_textprop_01.dump b/src/testdir/dumps/Test_textprop_01.dump
index 98130a795eb3220217a1024ad93f9caeb472bdf1..8687a0ab8824a0213f2395b0e8774c34ed090ae6 100644 (file)
--- 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| 

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index d810dfc884d40fff001d0442295331026f4e73ad..737ff209ee09a9fd95e461a55bbb1ea47f3e42fe 100644 (file)
--- 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', {})

diff --git a/src/version.c b/src/version.c
index 8dcd56f427f85e944cab7cbcd520f521d3690cc4..cd5e386de9c816ffde448187deee0bb11e079ad8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    681,
 /**/
     680,
 /**/