diff options
| author | Brandon Simmons <34775764+simmsbra@users.noreply.github.com> | 2022-05-23 14:13:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 20:13:22 +0100 |
| commit | 37ee800b519c2e071ad6cfe623721521558bb12d (patch) | |
| tree | c05923c5e6e50201897219965d818db771fcb897 | |
| parent | c2f4920d3b60123ac8edfda970217282492e8d4b (diff) | |
| download | rneovim-37ee800b519c2e071ad6cfe623721521558bb12d.tar.gz rneovim-37ee800b519c2e071ad6cfe623721521558bb12d.tar.bz2 rneovim-37ee800b519c2e071ad6cfe623721521558bb12d.zip | |
vim-patch:8.2.5009: fold may not be closeable after appending (#18722)
Problem: Fold may not be closeable after appending.
Solution: Set the fd_small flag to MAYBE. (Brandon Simmons, closes vim/vim#10471)
https://github.com/vim/vim/commit/e8c4a64bffbe628a46dc172d04cfc2db6e8dd8b6
| -rw-r--r-- | src/nvim/fold.c | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_fold.vim | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 9c8e92cd00..1bd6cfb0a4 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -2323,6 +2323,7 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *const gap, const int level, } fp->fd_len += fp->fd_top - firstlnum; fp->fd_top = firstlnum; + fp->fd_small = kNone; fold_changed = true; } else if ((flp->start != 0 && lvl == level) || (firstlnum != startlnum)) { diff --git a/src/nvim/testdir/test_fold.vim b/src/nvim/testdir/test_fold.vim index 538b6b622e..327f0f73f2 100644 --- a/src/nvim/testdir/test_fold.vim +++ b/src/nvim/testdir/test_fold.vim @@ -970,4 +970,23 @@ func Test_indent_one_line_fold_close() bw! endfunc +" Make sure that when appending [an indented line then a blank line] right +" before a single indented line, the resulting extended fold can be closed +func Test_indent_append_blank_small_fold_close() + new + setlocal sw=2 foldmethod=indent + " at first, the fold at the second line can't be closed since it's smaller + " than foldminlines + let lines =<< trim END + line 1 + line 4 + END + call setline(1, lines) + call append(1, [' line 2', '']) + " close all folds + normal zM + call assert_notequal(-1, foldclosed(2)) " the fold should be closed now + bw! +endfunc + " vim: shiftwidth=2 sts=2 expandtab |