From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 15 May 2022 12:08:02 +0000 (+0100)
Subject: patch 8.2.4957: text properties in a wrong position after a block change
X-Git-Tag: v8.2.4957
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b559b302e0ecc6fced03d5201dc30f10cff7af0a;p=vim

patch 8.2.4957: text properties in a wrong position after a block change

Problem:    Text properties in a wrong position after a block change.
Solution:   Adjust the properties columns. (closes #10427)
---

diff --git a/src/ops.c b/src/ops.c
index b11cbf541..5b4c2957b 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -1814,6 +1814,12 @@ op_change(oparg_T *oap)
 			oldp += bd.textcol;
 			STRMOVE(newp + offset, oldp);
 			ml_replace(linenr, newp, FALSE);
+#ifdef FEAT_PROP_POPUP
+			// Shift the properties for linenr as edit() would do.
+			if (curbuf->b_has_textprop)
+			    adjust_prop_columns(linenr, bd.textcol,
+						     vpos.coladd + ins_len, 0);
+#endif
 		    }
 		}
 		check_cursor();
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 50012acaf..8e1204142 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -2003,4 +2003,37 @@ func Test_prop_insert_multiline()
   bwipe!
 endfunc
 
+func Test_prop_blockwise_change()
+  new
+  call AddPropTypes()
+
+  call setline(1, ['foooooo', 'bar', 'baaaaz'])
+  call prop_add(1, 1, #{end_col: 3, type: 'one'})
+  call prop_add(2, 1, #{end_col: 3, type: 'two'})
+  call prop_add(3, 1, #{end_col: 3, type: 'three'})
+
+  " Replace the first two columns with '123', since 'start_incl' is false the
+  " prop is not extended.
+  call feedkeys("gg\<c-v>2jc123\<Esc>", 'nxt')
+
+  let lines =<< trim END
+      123oooooo
+      123ar
+      123aaaaz
+  END
+  call assert_equal(lines, getline(1, '$'))
+  let expected = [
+      \ {'lnum': 1, 'id': 0, 'col': 4, 'type_bufnr': 0, 'end': 1, 'type': 'one',
+      \ 'length': 1, 'start': 1},
+      \ {'lnum': 2, 'id': 0, 'col': 4, 'type_bufnr': 0, 'end': 1, 'type': 'two',
+      \ 'length': 1, 'start': 1},
+      \ {'lnum': 3, 'id': 0, 'col': 4, 'type_bufnr': 0, 'end': 1 ,
+      \ 'type': 'three', 'length': 1, 'start': 1}
+      \ ]
+  call assert_equal(expected, prop_list(1, #{end_lnum: 10}))
+
+  call DeletePropTypes()
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 821f3680e..711349a35 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4957,
 /**/
     4956,
 /**/