IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1213: adding a line below the last one does not expand fold (#21869)

Browse Source 
Problem:    Adding a line below the last one does not expand fold.
Solution:   Do not skip mark_adjust() when adding lines below the last one.
            (Brandon Simmons, closes vim/vim#11832, closes vim/vim#10698)

da3dd7d857

Co-authored-by: Brandon Simmons <simmsbra@gmail.com>
This commit is contained in:
zeertzjq 2023-01-18 07:33:18 +08:00 committed by GitHub
parent 1453c7163d
commit 0133fbb37a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/change.c
View File

@ -418,14 +418,7 @@ void appended_lines(linenr_T lnum, linenr_T count)
/// Like appended_lines(), but adjust marks first. /// Like appended_lines(), but adjust marks first.
void appended_lines_mark(linenr_T lnum, long count) void appended_lines_mark(linenr_T lnum, long count)
{ {
// Skip mark_adjust when adding a line after the last one, there can't mark_adjust(lnum + 1, (linenr_T)MAXLNUM, (linenr_T)count, 0L, kExtmarkUndo);
// be marks there. But it's still needed in diff mode.
if (lnum + count < curbuf->b_ml.ml_line_count || curwin->w_p_diff) {
mark_adjust(lnum + 1, (linenr_T)MAXLNUM, (linenr_T)count, 0L, kExtmarkUndo);
} else {
extmark_adjust(curbuf, lnum + 1, (linenr_T)MAXLNUM, (linenr_T)count, 0L,
kExtmarkUndo);
}
changed_lines(lnum + 1, 0, lnum + 1, (linenr_T)count, true); changed_lines(lnum + 1, 0, lnum + 1, (linenr_T)count, true);
} }
@ -1694,13 +1687,7 @@ int open_line(int dir, int flags, int second_line_indent, bool *did_do_comment)
} }
// Postpone calling changed_lines(), because it would mess up folding // Postpone calling changed_lines(), because it would mess up folding
// with markers. // with markers.
// Skip mark_adjust when adding a line after the last one, there can't mark_adjust(curwin->w_cursor.lnum + 1, (linenr_T)MAXLNUM, 1L, 0L, kExtmarkNOOP);
// be marks there. But still needed in diff mode.
if (curwin->w_cursor.lnum + 1 < curbuf->b_ml.ml_line_count
|| curwin->w_p_diff) {
mark_adjust(curwin->w_cursor.lnum + 1, (linenr_T)MAXLNUM, 1L, 0L,
kExtmarkNOOP);
}
did_append = true; did_append = true;
} else { } else {
// In MODE_VREPLACE state we are starting to replace the next line. // In MODE_VREPLACE state we are starting to replace the next line.

13
src/nvim/testdir/test_fold.vim
View File

@ -1483,4 +1483,17 @@ func Test_indent_with_L_command()
bwipe! bwipe!
endfunc endfunc
" Make sure that when there is a fold at the bottom of the buffer and a newline
" character is appended to the line, the fold gets expanded (instead of the new
" line not being part of the fold).
func Test_expand_fold_at_bottom_of_buffer()
new
" create a fold on the only line
fold
execute "normal A\<CR>"
call assert_equal([1, 1], range(1, 2)->map('foldlevel(v:val)'))
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab