mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 04:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4403: ml_get error with nested folds and deleting lines

Browse Source 
Problem:    ml_get error with nested folds and deleting lines.
Solution:   Correct the last line number before calling hasFoldingWin().
9437737833
This commit is contained in:
Sean Dewar
2022-02-19 15:13:37 +00:00
parent 5cb45dffba
commit 30bf40ec4b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/change.c
View File

@@ -223,19 +223,20 @@ static void changed_common(linenr_T lnum, colnr_T col, linenr_T lnume, long xtra
// values for the cursor. // values for the cursor.
// Update the folds for this window. Can't postpone this, because // Update the folds for this window. Can't postpone this, because
// a following operator might work on the whole fold: ">>dd". // a following operator might work on the whole fold: ">>dd".
foldUpdate(wp, lnum, lnume + xtra - 1); linenr_T last = lnume + xtra - 1; // last line after the change
foldUpdate(wp, lnum, last);
// The change may cause lines above or below the change to become // The change may cause lines above or below the change to become
// included in a fold. Set lnum/lnume to the first/last line that // included in a fold. Set lnum/lnume to the first/last line that
// might be displayed differently. // might be displayed differently.
// Set w_cline_folded here as an efficient way to update it when // Set w_cline_folded here as an efficient way to update it when
// inserting lines just above a closed fold. */ // inserting lines just above a closed fold.
bool folded = hasFoldingWin(wp, lnum, &lnum, NULL, false, NULL); bool folded = hasFoldingWin(wp, lnum, &lnum, NULL, false, NULL);
if (wp->w_cursor.lnum == lnum) { if (wp->w_cursor.lnum == lnum) {
wp->w_cline_folded = folded; wp->w_cline_folded = folded;
} }
folded = hasFoldingWin(wp, lnume, NULL, &lnume, false, NULL); folded = hasFoldingWin(wp, last, NULL, &last, false, NULL);
if (wp->w_cursor.lnum == lnume) { if (wp->w_cursor.lnum == last) {
wp->w_cline_folded = folded; wp->w_cline_folded = folded;
} }