Mercurial > vim
changeset 28823:980eaa09f940 v8.2.4935
patch 8.2.4935: with 'foldmethod' "indent" some lines not included in fold
Commit: https://github.com/vim/vim/commit/d98e75e23666c159c7e00bcf5b6ad9a933bb0534
Author: Brandon Simmons <simmsbra@gmail.com>
Date: Tue May 10 19:13:23 2022 +0100
patch 8.2.4935: with 'foldmethod' "indent" some lines not included in fold
Problem: With 'foldmethod' "indent" some lines are not included in the
fold. (Oleg Koshovetc)
Solution: Fix it. (Brandon Simmons, closes #10399, closes #3214)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 10 May 2022 20:15:02 +0200 |
| parents | a89ae180fa50 |
| children | 08e9b779b213 |
| files | src/fold.c src/testdir/test_fold.vim src/version.c |
| diffstat | 3 files changed, 29 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fold.c +++ b/src/fold.c @@ -2246,7 +2246,14 @@ foldUpdateIEMS(win_T *wp, linenr_T top, getlevel = foldlevelDiff; #endif else + { getlevel = foldlevelIndent; + // Start one line back, because if the line above "top" has an + // undefined fold level, folding it relies on the line under it, + // which is "top". + if (top > 1) + --fline.lnum; + } // Backup to a line for which the fold level is defined. Since it's // always defined for line one, we will stop there.
--- a/src/testdir/test_fold.vim +++ b/src/testdir/test_fold.vim @@ -1459,4 +1459,24 @@ func Test_fold_split() bw! endfunc +" Make sure that when you append under a blank line that is under a fold with +" the same indent level as your appended line, the fold expands across the +" blank line +func Test_indent_append_under_blank_line() + new + let lines =<< trim END + line 1 + line 2 + line 3 + END + call setline(1, lines) + setlocal sw=2 + setlocal foldmethod=indent foldenable + call assert_equal([0, 1, 1], range(1, 3)->map('foldlevel(v:val)')) + call append(3, '') + call append(4, ' line 5') + call assert_equal([0, 1, 1, 1, 1], range(1, 5)->map('foldlevel(v:val)')) + bw! +endfunc + " vim: shiftwidth=2 sts=2 expandtab