diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-04-24 21:48:07 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-04-24 21:49:47 +0800 |
| commit | 2511f3e76d895a725c1a833233e831c856d05422 (patch) | |
| tree | a26196c54dbb8825be3d6652db5e8ad94eca217c | |
| parent | 3e41e7d9c10d9159276f0258a6317175c9772955 (diff) | |
| download | rneovim-2511f3e76d895a725c1a833233e831c856d05422.tar.gz rneovim-2511f3e76d895a725c1a833233e831c856d05422.tar.bz2 rneovim-2511f3e76d895a725c1a833233e831c856d05422.zip | |
vim-patch:8.2.4813: pasting text while indent folding may mess up folds
Problem: Pasting text while indent folding may mess up folds.
Solution: Adjust the way folds are split. (Brandon Simmons, closes vim/vim#10254)
https://github.com/vim/vim/commit/2c40707baa13a53cac4137ffb8b2ac67f50cea63
| -rw-r--r-- | src/nvim/fold.c | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_fold.vim | 20 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 3643ceb460..e08d6d4a4e 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -1058,7 +1058,7 @@ void cloneFoldGrowArray(garray_T *from, garray_T *to) // foldFind() {{{2 /// Search for line "lnum" in folds of growarray "gap". -/// Set *fpp to the fold struct for the fold that contains "lnum" or +/// Set "*fpp" to the fold struct for the fold that contains "lnum" or /// the first fold below it (careful: it can be beyond the end of the array!). /// /// @return false when there is no fold that contains "lnum". @@ -2615,7 +2615,8 @@ static void foldSplit(buf_T *buf, garray_T *const gap, const int i, const linenr // any between top and bot, they have been removed by the caller. garray_T *const gap1 = &fp->fd_nested; garray_T *const gap2 = &fp[1].fd_nested; - if (foldFind(gap1, bot + 1 - fp->fd_top, &fp2)) { + (void)foldFind(gap1, bot + 1 - fp->fd_top, &fp2); + if (fp2 != NULL) { const int len = (int)((fold_T *)gap1->ga_data + gap1->ga_len - fp2); if (len > 0) { ga_grow(gap2, len); diff --git a/src/nvim/testdir/test_fold.vim b/src/nvim/testdir/test_fold.vim index 6da1b3d4a0..9f5ad53adb 100644 --- a/src/nvim/testdir/test_fold.vim +++ b/src/nvim/testdir/test_fold.vim @@ -881,4 +881,24 @@ func Test_fold_relative_move() set fdm& sw& wrap& tw& endfunc +" Make sure a fold containing a nested fold is split correctly when using +" foldmethod=indent +func Test_fold_split() + new + let lines =<< trim END + line 1 + line 2 + line 3 + line 4 + line 5 + END + call setline(1, lines) + setlocal sw=2 + setlocal foldmethod=indent foldenable + call assert_equal([0, 1, 1, 2, 2], range(1, 5)->map('foldlevel(v:val)')) + call append(2, 'line 2.5') + call assert_equal([0, 1, 0, 1, 2, 2], range(1, 6)->map('foldlevel(v:val)')) + bw! +endfunc + " vim: shiftwidth=2 sts=2 expandtab |