diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-25 22:13:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-25 22:13:29 +0200 |
| commit | 1fd30d7bae1b3e57f008c052d765a3ec73d58114 (patch) | |
| tree | 9b2bd3dbfba4406d89eb6e89dad0cdd2dae50f4a | |
| parent | 7aee6876eb4a66cc9d475e30bb58c060e7d4e90e (diff) | |
| download | vim-git-1fd30d7bae1b3e57f008c052d765a3ec73d58114.tar.gz | |
patch 8.1.2216: text property in wrong place after :substitutev8.1.2216
Problem: Text property in wrong place after :substitute.
Solution: Pass the new column instead of the old one. (Christian Brabandt,
closes #4427)
| -rw-r--r-- | src/ex_cmds.c | 14 | ||||
| -rw-r--r-- | src/testdir/test_textprop.vim | 28 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 40 insertions, 4 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index e472c8a6f..715360628 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -3856,6 +3856,7 @@ do_sub(exarg_T *eap) colnr_T matchcol; colnr_T prev_matchcol = MAXCOL; char_u *new_end, *new_start = NULL; + colnr_T total_added = 0; unsigned new_start_len = 0; char_u *p1; int did_sub = FALSE; @@ -4279,13 +4280,18 @@ do_sub(exarg_T *eap) #ifdef FEAT_TEXT_PROP if (curbuf->b_has_textprop) { + int bytes_added = sublen - 1 - (regmatch.endpos[0].col + - regmatch.startpos[0].col); + // When text properties are changed, need to save for // undo first, unless done already. - if (adjust_prop_columns(lnum, regmatch.startpos[0].col, - sublen - 1 - (regmatch.endpos[0].col - - regmatch.startpos[0].col), - apc_flags)) + if (adjust_prop_columns(lnum, + total_added + regmatch.startpos[0].col, + bytes_added, apc_flags)) apc_flags &= ~APC_SAVE_FOR_UNDO; + // Offset for column byte number of the text property + // in the resulting buffer afterwards. + total_added += bytes_added; } #endif } diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim index 54cf5f3c7..b09e1a797 100644 --- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -866,3 +866,31 @@ func Test_textprop_in_unloaded_buf() cal delete('Xaaa') cal delete('Xbbb') endfunc + +func Test_proptype_substitute2() + new + " text_prop.vim + call setline(1, [ + \ 'The num 123 is smaller than 4567.', + \ '123 The number 123 is smaller than 4567.', + \ '123 The number 123 is smaller than 4567.']) + + call prop_type_add('number', {'highlight': 'ErrorMsg'}) + + call prop_add(1, 12, {'length': 3, 'type': 'number'}) + call prop_add(2, 1, {'length': 3, 'type': 'number'}) + call prop_add(3, 36, {'length': 4, 'type': 'number'}) + set ul& + let expected = [{'id': 0, 'col': 13, 'end': 1, 'type': 'number', 'length': 3, 'start': 1}, + \ {'id': 0, 'col': 1, 'end': 1, 'type': 'number', 'length': 3, 'start': 1}, + \ {'id': 0, 'col': 50, 'end': 1, 'type': 'number', 'length': 4, 'start': 1}] + " Add some text in between + %s/\s\+/ /g + call assert_equal(expected, prop_list(1) + prop_list(2) + prop_list(3)) + + " remove some text + :1s/[a-z]\{3\}//g + let expected = [{'id': 0, 'col': 10, 'end': 1, 'type': 'number', 'length': 3, 'start': 1}] + call assert_equal(expected, prop_list(1)) + bwipe! +endfunc diff --git a/src/version.c b/src/version.c index b30faa756..c95f30583 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2216, +/**/ 2215, /**/ 2214, |