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)
e8c4a64bff
This commit is contained in:
Brandon Simmons 2022-05-23 14:13:22 -05:00 committed by GitHub
parent c2f4920d3b
commit 37ee800b51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions

View File

@ -2323,6 +2323,7 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *const gap, const int level,
} }
fp->fd_len += fp->fd_top - firstlnum; fp->fd_len += fp->fd_top - firstlnum;
fp->fd_top = firstlnum; fp->fd_top = firstlnum;
fp->fd_small = kNone;
fold_changed = true; fold_changed = true;
} else if ((flp->start != 0 && lvl == level) } else if ((flp->start != 0 && lvl == level)
|| (firstlnum != startlnum)) { || (firstlnum != startlnum)) {

View File

@ -970,4 +970,23 @@ func Test_indent_one_line_fold_close()
bw! bw!
endfunc 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 " vim: shiftwidth=2 sts=2 expandtab