diff options
| -rw-r--r-- | src/nvim/fold.c | 4 | ||||
| -rw-r--r-- | test/old/testdir/test_fold.vim | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 863c61d958..6cbf94dced 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -2980,7 +2980,9 @@ static void foldlevelExpr(fline_T *flp) // "<1", "<2", .. : end a fold with a certain level case '<': - flp->lvl_next = n - 1; + // 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/test/old/testdir/test_fold.vim b/test/old/testdir/test_fold.vim index e529a94174..eae6952e72 100644 --- a/test/old/testdir/test_fold.vim +++ b/test/old/testdir/test_fold.vim @@ -1578,4 +1578,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 |