IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fold: check_closed() returns bool

Browse Source 
Update affected variables (ie. had_folded).
Add const to params to restrict usage.

TODO: refactor win_T.w_lines[idx].wl_folded from char to bool
This commit is contained in:
Jan Edmund Lazo 2018-07-16 10:39:14 -04:00
parent 4fb9b42869
commit 6dfaf8e914
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/nvim/fold.c
View File

@ -160,7 +160,7 @@ bool hasFoldingWin(
foldinfo_T *infop /* where to store fold info */ foldinfo_T *infop /* where to store fold info */
) )
{ {
int had_folded = FALSE; bool had_folded = false;
linenr_T first = 0; linenr_T first = 0;
linenr_T last = 0; linenr_T last = 0;
linenr_T lnum_rel = lnum; linenr_T lnum_rel = lnum;
@ -1506,26 +1506,27 @@ static int getDeepestNestingRecurse(garray_T *gap)
/* /*
* Check if a fold is closed and update the info needed to check nested folds. * Check if a fold is closed and update the info needed to check nested folds.
*/ */
static int static bool check_closed(
check_closed( win_T *const win,
win_T *win, fold_T *const fp,
fold_T *fp, int *const use_levelp, // TRUE: outer fold had FD_LEVEL
int *use_levelp, // TRUE: outer fold had FD_LEVEL const int level, // folding depth
int level, // folding depth int *const maybe_smallp, // TRUE: outer this had fd_small == kNone
int *maybe_smallp, // TRUE: outer this had fd_small == MAYBE const linenr_T lnum_off // line number offset for fp->fd_top
linenr_T lnum_off // line number offset for fp->fd_top
) )
{ {
int closed = FALSE; bool closed = false;
/* Check if this fold is closed. If the flag is FD_LEVEL this /* Check if this fold is closed. If the flag is FD_LEVEL this
* fold and all folds it contains depend on 'foldlevel'. */ * fold and all folds it contains depend on 'foldlevel'. */
if (*use_levelp || fp->fd_flags == FD_LEVEL) { if (*use_levelp || fp->fd_flags == FD_LEVEL) {
*use_levelp = TRUE; *use_levelp = TRUE;
if (level >= win->w_p_fdl) if (level >= win->w_p_fdl) {
closed = TRUE; closed = true;
} else if (fp->fd_flags == FD_CLOSED) }
closed = TRUE; } else if (fp->fd_flags == FD_CLOSED) {
closed = true;
}
// Small fold isn't closed anyway. // Small fold isn't closed anyway.
if (fp->fd_small == kNone) { if (fp->fd_small == kNone) {
@ -1537,7 +1538,7 @@ check_closed(
} }
checkSmall(win, fp, lnum_off); checkSmall(win, fp, lnum_off);
if (fp->fd_small == kTrue) { if (fp->fd_small == kTrue) {
closed = FALSE; closed = false;
} }
} }
return closed; return closed;