diff options
| author | Shota Nozaki <emonkak@gmail.com> | 2024-01-03 19:18:43 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-01-03 19:18:43 +0100 |
| commit | 0689b870595c687a23e102913ce5037f65d03748 (patch) | |
| tree | 168af75375f949bf0f26943894fe974349ea6e56 | |
| parent | bf44b69d1f91d9778ae1887128c63d35d9a3d19b (diff) | |
patch 9.1.0002: a closing fold expr, may start a new foldv9.1.0002
Problem: a closing fold expression may unexpectedly start a new fold
when it should end a fold
(reported by Shota Nozaki)
Solution: if a fold hasn't started yet, do not immediately
start a new fold with level 1
(Shota Nozaki)
fixes: #12768
closes: #13748
Signed-off-by: Shota Nozaki <emonkak@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/fold.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_fold.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/src/fold.c b/src/fold.c index be20991c7a..5c41ed1b05 100644 --- a/src/fold.c +++ b/src/fold.c @@ -3362,7 +3362,9 @@ foldlevelExpr(fline_T *flp) break; // "<1", "<2", .. : end a fold with a certain level - case '<': flp->lvl_next = n - 1; + case '<': // To prevent an unexpected start of a new fold, the next + // level must not exceed the level of the current fold. + flp->lvl_next = MIN(flp->lvl, n - 1); flp->end = n; break; diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim index cb29d43d54..3c78e62c3e 100644 --- a/src/testdir/test_fold.vim +++ b/src/testdir/test_fold.vim @@ -1778,4 +1778,17 @@ func Test_foldexpr_return_empty_string() bwipe! endfunc +" Make sure that when ending a fold that hasn't been started, it does not +" start a new fold. +func Test_foldexpr_end_fold() + new + setlocal foldmethod=expr + let &l:foldexpr = 'v:lnum == 2 ? "<2" : "="' + call setline(1, range(1, 3)) + redraw + call assert_equal([0, 0, 0], range(1, 3)->map('foldlevel(v:val)')) + + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index c4e7fa3db7..8c71b6864f 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2, +/**/ 1, /**/ 0 |