patch 8.2.2890: text property duplicated when data block splits

Problem:    Text property duplicated when data block splits.
Solution:   Do not continue text prop from previous line. (closes #8261)

diff --git a/src/memline.c b/src/memline.c
index 4c4a1b24cb1972c7bf4436727adb403b1f3d4697..5356369c16809b30afddf1fef8293dfb6ccecb63 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -2772,7 +2772,8 @@ ml_append_int(
        len = (colnr_T)STRLEN(line) + 1;        // space needed for the text
 
 #ifdef FEAT_PROP_POPUP
-    if (curbuf->b_has_textprop && lnum > 0 && !(flags & ML_APPEND_UNDO))
+    if (curbuf->b_has_textprop && lnum > 0
+                            && !(flags & (ML_APPEND_UNDO | ML_APPEND_NOPROP)))
        // Add text properties that continue from the previous line.
        add_text_props_for_append(buf, lnum, &line, &len, &tofree);
 #endif
@@ -3992,7 +3993,11 @@ ml_flush_line(buf_T *buf)
                 */
                // How about handling errors???
                (void)ml_append_int(buf, lnum, new_line, new_len,
-                        (dp->db_index[idx] & DB_MARKED) ? ML_APPEND_MARK : 0);
+                        ((dp->db_index[idx] & DB_MARKED) ? ML_APPEND_MARK : 0)
+#ifdef FEAT_PROP_POPUP
+                            | ML_APPEND_NOPROP
+#endif
+                        );
                (void)ml_delete_int(buf, lnum, 0);
            }
        }

diff --git a/src/structs.h b/src/structs.h
index 3bb641be8454a6b916b03ccfa5ee084d3b5a701d..a923a35edc516a8b8d44a7e233ada6214245c631 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -774,6 +774,7 @@ typedef struct memline
 #define ML_APPEND_NEW      1   // starting to edit a new file
 #define ML_APPEND_MARK     2   // mark the new line
 #define ML_APPEND_UNDO     4   // called from undo
+#define ML_APPEND_NOPROP    8  // do not continue textprop from previous line
 
 
 /*

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index efa31f0a0a85e0a3823b017722c712d1e69dfd15..d1e8f38d49b0cc77d2f060b57050fb6a1434b21a 100644 (file)
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -1469,5 +1469,24 @@ func Test_prop_one_line_window()
   bwipe!
 endfunc
 
+" This was calling ml_append_int() and copy a text property from a previous
+" line at the wrong moment.  Exact text length matters.
+def Test_prop_splits_data_block()
+  new
+  var lines: list<string> = [repeat('x', 35)]->repeat(41)
+                       + [repeat('!', 35)]
+                       + [repeat('x', 35)]->repeat(56)
+  lines->setline(1)
+  prop_type_add('someprop', {highlight: 'ErrorMsg'})
+  prop_add(1, 27, {end_lnum: 1, end_col: 70, type: 'someprop'})
+  prop_remove({type: 'someprop'}, 1)
+  prop_add(35, 22, {end_lnum: 43, end_col: 43, type: 'someprop'})
+  prop_remove({type: 'someprop'}, 35, 43)
+  assert_equal([], prop_list(42))
+
+  bwipe!
+  prop_type_delete('someprop')
+enddef
+
 
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index 56f0f0b946b678db52b630876f9c874866552c9d..e61edc6a31def6fd4ef865b8fbdf505c05d9bb11 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2890,
 /**/
     2889,
 /**/