mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 13:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix changed byte ranges for indented lines

Browse Source
This commit is contained in:
jbyuki
2021-06-09 11:35:15 +02:00
parent 93f15db5d6
commit d9e11f4f78
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/change.c
View File

@@ -1690,18 +1690,22 @@ int open_line(
if (trunc_line && !(flags & OPENLINE_KEEPTRAIL)) { if (trunc_line && !(flags & OPENLINE_KEEPTRAIL)) {
truncate_spaces(saved_line); truncate_spaces(saved_line);
} }
ml_replace(curwin->w_cursor.lnum, saved_line, false); ml_replace(curwin->w_cursor.lnum, saved_line, false);
int new_len = (int)STRLEN(saved_line); int new_len = (int)STRLEN(saved_line);
// TODO(vigoux): maybe there is issues there with expandtabs ? // TODO(vigoux): maybe there is issues there with expandtabs ?
int cols_spliced = 0;
if (new_len < curwin->w_cursor.col) { if (new_len < curwin->w_cursor.col) {
extmark_splice_cols( extmark_splice_cols(
curbuf, (int)curwin->w_cursor.lnum, curbuf, (int)curwin->w_cursor.lnum - 1,
new_len, curwin->w_cursor.col - new_len, 0, kExtmarkUndo); new_len, curwin->w_cursor.col - new_len, 0, kExtmarkUndo);
cols_spliced = curwin->w_cursor.col - new_len;
} }
saved_line = NULL; saved_line = NULL;
if (did_append) { if (did_append) {
changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col,
curwin->w_cursor.lnum + 1, 1L, true); curwin->w_cursor.lnum + 1, 1L, true);
@@ -1715,13 +1719,14 @@ int open_line(
} }
// Always move extmarks - Here we move only the line where the // Always move extmarks - Here we move only the line where the
// cursor is, the previous mark_adjust takes care of the lines after // cursor is, the previous mark_adjust takes care of the lines after
int cols_added = mincol-1+less_cols_off-less_cols; int cols_added = mincol-1+less_cols_off-less_cols-new_len;
extmark_splice(curbuf, (int)lnum-1, mincol-1, extmark_splice(curbuf, (int)lnum-1, mincol-1 - cols_spliced,
0, less_cols_off, less_cols_off, 0, less_cols_off, less_cols_off,
1, cols_added, 1 + cols_added, kExtmarkUndo); 1, cols_added, 1 + cols_added, kExtmarkUndo);
} else { } else {
changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col); changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
} }
} }
// Put the cursor on the new line. Careful: the scrollup() above may // Put the cursor on the new line. Careful: the scrollup() above may