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

fix(PVS/V583): the '?:' operator always returns one and the same value (#17790)

Browse Source
This commit is contained in:
dundargoc
2022-03-21 00:25:03 +01:00
committed by GitHub
parent 18900758c3
commit e9b53f3fb5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/window.c
View File

@@ -1082,7 +1082,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
} }
} }
} else { } else {
hsep_height = global_stl_height() > 0 ? 1 : STATUS_HEIGHT; hsep_height = STATUS_HEIGHT;
layout = FR_COL; layout = FR_COL;
/* /*
@@ -1374,8 +1374,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
} }
frame_new_height(curfrp, new_fr_height, flags & WSP_TOP, false); frame_new_height(curfrp, new_fr_height, flags & WSP_TOP, false);
} else { } else {
win_new_height(oldwin, oldwin_height - (new_size win_new_height(oldwin, oldwin_height - (new_size + STATUS_HEIGHT));
+ (global_stl_height() > 0 ? 1 : STATUS_HEIGHT)));
} }
if (before) { // new window above current one if (before) { // new window above current one
@@ -1643,7 +1642,7 @@ int make_windows(int count, bool vertical)
// Each window needs at least 'winminheight' lines // Each window needs at least 'winminheight' lines
// If statusline isn't global, each window also needs a statusline // If statusline isn't global, each window also needs a statusline
maxcount = (curwin->w_height + curwin->w_hsep_height + curwin->w_status_height maxcount = (curwin->w_height + curwin->w_hsep_height + curwin->w_status_height
- (p_wh - p_wmh)) / (p_wmh + (global_stl_height() > 0 ? 1 : STATUS_HEIGHT)); - (p_wh - p_wmh)) / (p_wmh + STATUS_HEIGHT);
} }
if (maxcount < 2) { if (maxcount < 2) {
@@ -2166,7 +2165,7 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
totwincount -= wincount; totwincount -= wincount;
} }
} else { // topfr->fr_layout == FR_COL } else { // topfr->fr_layout == FR_COL
hsep_height = global_stl_height() > 0 ? 1 : STATUS_HEIGHT; hsep_height = STATUS_HEIGHT;
topfr->fr_width = width; topfr->fr_width = width;
topfr->fr_height = height; topfr->fr_height = height;