aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/change.c
diff options
context:
space:
mode:
authorJaehwang Jung <tomtomjhj@gmail.com>2023-12-05 09:40:48 +0900
committerGitHub <noreply@github.com>2023-12-05 08:40:48 +0800
commit3159a2c28f5ea8797cb525c74dedd622bfe4a0a1 (patch)
tree0fa25e011924f8854122addb9a28e4c6b7b34d64 /src/nvim/change.c
parentc3836e40a2bffbc1d4e06531145b7825788dd818 (diff)
downloadrneovim-3159a2c28f5ea8797cb525c74dedd622bfe4a0a1.tar.gz
rneovim-3159a2c28f5ea8797cb525c74dedd622bfe4a0a1.tar.bz2
rneovim-3159a2c28f5ea8797cb525c74dedd622bfe4a0a1.zip
fix(change): update fold after on_bytes (#26364)
Problem: With vim.treesitter.foldexpr, `o`-ing two lines above a folded region opens the fold. This does not happen with legacy foldexprs. For example, make a markdown file with the following text (without indentation), enable treesitter fold, and follow the instruction in the text. put cursor on this line and type zoo<Esc> initially folded, revealed by zo # then this fold will be opened initially folded, revealed by o<Esc> Analysis: * `o` updates folds first (done in `changed_lines`), evaluating foldexpr, and then invokes `on_bytes` (done in `extmark_splice`). * Treesitter fold allocates the foldinfo for added lines (`add_range`) on `on_bytes`. * Therefore, when treesitter foldexpr is invoked while running `o`, it sees outdated foldinfo. Solution: `extmark_splice`, and then `changed_lines`. This seems to be the standard order in other places, e.g., `nvim_buf_set_lines`.
Diffstat (limited to 'src/nvim/change.c')
-rw-r--r--src/nvim/change.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/change.c b/src/nvim/change.c
index efc2db1413..c528ffba20 100644
--- a/src/nvim/change.c
+++ b/src/nvim/change.c
@@ -1839,11 +1839,11 @@ int open_line(int dir, int flags, int second_line_indent, bool *did_do_comment)
curwin->w_cursor.lnum = old_cursor.lnum + 1;
}
if (did_append) {
- changed_lines(curbuf, curwin->w_cursor.lnum, 0, curwin->w_cursor.lnum, 1, true);
// bail out and just get the final length of the line we just manipulated
bcount_t extra = (bcount_t)strlen(ml_get(curwin->w_cursor.lnum));
extmark_splice(curbuf, (int)curwin->w_cursor.lnum - 1, 0,
0, 0, 0, 1, 0, 1 + extra, kExtmarkUndo);
+ changed_lines(curbuf, curwin->w_cursor.lnum, 0, curwin->w_cursor.lnum, 1, true);
}
curbuf_splice_pending--;