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

Merge pull request #23300 from neovim/backport-23296-to-release-0.9

Browse Source 
[Backport release-0.9] fix(column): don't reset 'statuscolumn' width after it has been drawn
This commit is contained in:
zeertzjq
2023-04-24 22:36:40 +08:00
committed by GitHub
parent a977c8b5fe f991ddd1ab
commit 0c8e2d128e
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/drawscreen.c
View File

@@ -574,9 +574,9 @@ int update_screen(void)
draw_tabline(); draw_tabline();
} }
// Correct stored syntax highlighting info for changes in each displayed
// buffer. Each buffer must only be done once.
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
// Correct stored syntax highlighting info for changes in each displayed
// buffer. Each buffer must only be done once.
update_window_hl(wp, type >= UPD_NOT_VALID || hl_changed); update_window_hl(wp, type >= UPD_NOT_VALID || hl_changed);
buf_T *buf = wp->w_buffer; buf_T *buf = wp->w_buffer;
@@ -592,6 +592,11 @@ int update_screen(void)
buf->b_mod_tick_decor = display_tick; buf->b_mod_tick_decor = display_tick;
} }
} }
// Reset 'statuscolumn' if there is no dedicated signcolumn but it is invalid.
if (*wp->w_p_stc != NUL && !wp->w_buffer->b_signcols.valid && win_no_signcol(wp)) {
wp->w_nrwidth_line_count = 0;
}
} }
// Go from top to bottom through the windows, redrawing the ones that need it. // Go from top to bottom through the windows, redrawing the ones that need it.
@@ -599,6 +604,11 @@ int update_screen(void)
screen_search_hl.rm.regprog = NULL; screen_search_hl.rm.regprog = NULL;
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
// Validate b_signcols if there is no dedicated signcolumn but 'statuscolumn' is set.
if (*wp->w_p_stc != NUL && win_no_signcol(wp)) {
buf_signcols(wp->w_buffer, 0);
}
if (wp->w_redr_type == UPD_CLEAR && wp->w_floating && wp->w_grid_alloc.chars) { if (wp->w_redr_type == UPD_CLEAR && wp->w_floating && wp->w_grid_alloc.chars) {
grid_invalidate(&wp->w_grid_alloc); grid_invalidate(&wp->w_grid_alloc);
wp->w_redr_type = UPD_NOT_VALID; wp->w_redr_type = UPD_NOT_VALID;

23
src/nvim/option.c
View File

@@ -5505,6 +5505,14 @@ int win_signcol_count(win_T *wp)
return win_signcol_configured(wp, NULL); return win_signcol_configured(wp, NULL);
} }
/// Return true when window "wp" has no sign column.
bool win_no_signcol(win_T *wp)
{
const char *scl = wp->w_p_scl;
return (*scl == 'n' && (*(scl + 1) == 'o' || (*(scl + 1) == 'u'
&& (wp->w_p_nu || wp->w_p_rnu))));
}
/// Return the number of requested sign columns, based on user / configuration. /// Return the number of requested sign columns, based on user / configuration.
int win_signcol_configured(win_T *wp, int *is_fixed) int win_signcol_configured(win_T *wp, int *is_fixed)
{ {
@@ -5514,20 +5522,7 @@ int win_signcol_configured(win_T *wp, int *is_fixed)
*is_fixed = 1; *is_fixed = 1;
} }
// Note: It checks "no" or "number" in 'signcolumn' option if (win_no_signcol(wp)) {
if (*scl == 'n'
&& (*(scl + 1) == 'o' || (*(scl + 1) == 'u'
&& (wp->w_p_nu || wp->w_p_rnu)))) {
if (!wp->w_buffer->b_signcols.valid) {
FOR_ALL_WINDOWS_IN_TAB(win, curtab) {
if (*win->w_p_stc != NUL) {
win->w_nrwidth_line_count = 0;
}
}
}
if (*wp->w_p_stc != NUL) {
buf_signcols(wp->w_buffer, 0);
}
return 0; return 0;
} }