mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fold: foldMoveRange(): fix :move bug #6534

Browse Source 
Closes #6540

In #6221 there was a mistake in calculating which folds need to be
re-ordered. When there are no folds after those that have been adjusted,
then `move_end` remains 0. This results in reverse_fold_order()
swapping folds that have been adjusted with uninitialised folds in the
remainder of the grow array.

Add a check in foldMoveRange() to account for this case.
This commit is contained in:
Matthew Malcomson
2017-04-16 20:15:50 +01:00
committed by Justin M. Keyes
parent 77a4f8f235
commit 263849b2dd
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/fold.c
View File

@@ -2765,10 +2765,13 @@ void foldMoveRange(garray_T *gap, const linenr_T line1, const linenr_T line2,
}
dest_index = FOLD_INDEX(fp, gap);
// All folds are now correct, but they are not necessarily in the correct
// order.
// We have to swap folds in the range [move_end, dest_index) with those in
// the range [move_start, move_end).
// All folds are now correct, but not necessarily in the correct order.
// We must swap folds in the range [move_end, dest_index) with those in the
// range [move_start, move_end).
if (move_end == 0) {
// There are no folds after those moved, so none were moved out of order.
return;
}
reverse_fold_order(gap, move_start, dest_index - 1);
reverse_fold_order(gap, move_start, move_start + dest_index - move_end - 1);
reverse_fold_order(gap, move_start + dest_index - move_end, dest_index - 1);