Mercurial > vim
changeset 15398:3e02464faaac v8.1.0707
patch 8.1.0707: text property columns are not adjusted for changed indent
commit https://github.com/vim/vim/commit/663bc89bbb8158bd0888f7d7228b2dbc6bbd4802
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 8 23:07:24 2019 +0100
patch 8.1.0707: text property columns are not adjusted for changed indent
Problem: Text property columns are not adjusted for changed indent.
Solution: Adjust text properties.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 08 Jan 2019 23:15:05 +0100 |
| parents | 32c14d681e03 |
| children | a715450117cf |
| files | src/misc1.c src/testdir/test_textprop.vim src/version.c |
| diffstat | 3 files changed, 47 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc1.c +++ b/src/misc1.c @@ -411,24 +411,29 @@ set_indent( } mch_memmove(s, p, (size_t)line_len); - /* Replace the line (unless undo fails). */ + // Replace the line (unless undo fails). if (!(flags & SIN_UNDO) || u_savesub(curwin->w_cursor.lnum) == OK) { ml_replace(curwin->w_cursor.lnum, newline, FALSE); if (flags & SIN_CHANGED) changed_bytes(curwin->w_cursor.lnum, 0); - /* Correct saved cursor position if it is in this line. */ + + // Correct saved cursor position if it is in this line. if (saved_cursor.lnum == curwin->w_cursor.lnum) { if (saved_cursor.col >= (colnr_T)(p - oldline)) - /* cursor was after the indent, adjust for the number of - * bytes added/removed */ + // cursor was after the indent, adjust for the number of + // bytes added/removed saved_cursor.col += ind_len - (colnr_T)(p - oldline); else if (saved_cursor.col >= (colnr_T)(s - newline)) - /* cursor was in the indent, and is now after it, put it back - * at the start of the indent (replacing spaces with TAB) */ + // cursor was in the indent, and is now after it, put it back + // at the start of the indent (replacing spaces with TAB) saved_cursor.col = (colnr_T)(s - newline); } +#ifdef FEAT_TEXT_PROP + adjust_prop_columns(curwin->w_cursor.lnum, (colnr_T)(p - oldline), + ind_len - (colnr_T)(p - oldline)); +#endif retval = TRUE; } else
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -342,6 +342,40 @@ func Test_prop_substitute() bwipe! endfunc +func Test_prop_change_indent() + call prop_type_add('comment', {'highlight': 'Directory'}) + new + call setline(1, [' xxx', 'yyyyy']) + call prop_add(2, 2, {'length': 2, 'type': 'comment'}) + let expect = {'col': 2, 'length': 2, 'type': 'comment', 'start': 1, 'end': 1, 'id': 0} + call assert_equal([expect], prop_list(2)) + + set shiftwidth=3 + normal 2G>> + call assert_equal(' yyyyy', getline(2)) + let expect.col += 3 + call assert_equal([expect], prop_list(2)) + + normal 2G== + call assert_equal(' yyyyy', getline(2)) + let expect.col = 6 + call assert_equal([expect], prop_list(2)) + + call prop_clear(2) + call prop_add(2, 2, {'length': 5, 'type': 'comment'}) + let expect.col = 2 + let expect.length = 5 + call assert_equal([expect], prop_list(2)) + + normal 2G<< + call assert_equal(' yyyyy', getline(2)) + let expect.length = 2 + call assert_equal([expect], prop_list(2)) + + set shiftwidth& + call prop_type_delete('comment') +endfunc + " Setup a three line prop in lines 2 - 4. " Add short props in line 1 and 5. func Setup_three_line_prop()