diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-16 15:59:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-16 15:59:14 +0100 |
| commit | 40ebc0afda8d8e478d2090133ed6a3cd3d8da3ec (patch) | |
| tree | a28817099119c9844e204512a0e222195bc0eceb /src/testdir/test_fold.vim | |
| parent | f3757f0c87bbd52c7989c85dcbd21511bffcbdd6 (diff) | |
| download | vim-git-40ebc0afda8d8e478d2090133ed6a3cd3d8da3ec.tar.gz | |
patch 8.0.0465: off-by-one error in using :move with foldingv8.0.0465
Problem: Off-by-one error in using :move with folding.
Solution: Correct off-by-one mistakes and add more tests. (Matthew
Malcomson)
Diffstat (limited to 'src/testdir/test_fold.vim')
| -rw-r--r-- | src/testdir/test_fold.vim | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim index 19c94140d..46c54e861 100644 --- a/src/testdir/test_fold.vim +++ b/src/testdir/test_fold.vim @@ -249,7 +249,7 @@ func! Test_move_folds_around_manual() redraw! set fdm=manual call cursor(2, 1) - norm! zR + %foldopen 7,12m0 let folds=repeat([-1], 18) call assert_equal(PrepIndent("b") + PrepIndent("a") + PrepIndent("c"), getline(1, '$')) @@ -284,6 +284,16 @@ func! Test_move_folds_around_manual() call assert_equal(0, foldlevel(6)) call assert_equal(9, foldclosedend(7)) call assert_equal([-1, 2, 2, 2, 2, -1, 7, 7, 7, -1], map(range(1, line('$')), 'foldclosed(v:val)')) + %d + " Ensure moving around the edges still works. + call setline(1, PrepIndent("a") + repeat(["a"], 3) + ["\ta"]) + set fdm=indent foldlevel=0 + set fdm=manual + %foldopen + 6m$ + " The first fold has been truncated to the 5'th line. + " Second fold has been moved up because the moved line is now below it. + call assert_equal([0, 1, 1, 1, 1, 0, 0, 0, 1, 0], map(range(1, line('$')), 'foldlevel(v:val)')) bw! endfunc @@ -307,7 +317,7 @@ func! Test_move_folds_around_indent() call setline(1, PrepIndent("a") + PrepIndent("b") + PrepIndent("c")) set fdm=indent call cursor(2, 1) - norm! zR + %foldopen 7,12m0 let folds=repeat([-1], 18) call assert_equal(PrepIndent("b") + PrepIndent("a") + PrepIndent("c"), getline(1, '$')) @@ -339,5 +349,14 @@ func! Test_move_folds_around_indent() call assert_equal(1, foldlevel(6)) call assert_equal(9, foldclosedend(7)) call assert_equal([-1, 2, 2, 2, 2, 2, 2, 2, 2, -1], map(range(1, line('$')), 'foldclosed(v:val)')) + " Ensure moving around the edges still works. + %d + call setline(1, PrepIndent("a") + repeat(["a"], 3) + ["\ta"]) + set fdm=indent foldlevel=0 + %foldopen + 6m$ + " The first fold has been truncated to the 5'th line. + " Second fold has been moved up because the moved line is now below it. + call assert_equal([0, 1, 1, 1, 1, 0, 0, 0, 1, 1], map(range(1, line('$')), 'foldlevel(v:val)')) bw! endfunc |