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

Merge pull request #26709 from luukvbaal/drawstatuscol

Browse Source
This commit is contained in:
zeertzjq 2023-12-22 19:35:26 +08:00 committed by GitHub
commit 2151e781e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/drawline.c
View File

@ -663,7 +663,6 @@ static void get_statuscol_str(win_T *wp, linenr_T lnum, int virtnum, statuscol_T
} }
/// Get information needed to display the next segment in the 'statuscolumn'. /// Get information needed to display the next segment in the 'statuscolumn'.
/// If not yet at the end, prepare for next segment and decrement "wlv->draw_state".
/// ///
/// @param stcp Status column attributes /// @param stcp Status column attributes
/// @param[in,out] wlv /// @param[in,out] wlv
@ -671,22 +670,19 @@ static void draw_statuscol(win_T *wp, statuscol_T *stcp, winlinevars_T *wlv)
{ {
do { do {
int attr = stcp->cur_attr; int attr = stcp->cur_attr;
char *text = stcp->textp; char *start = stcp->textp;
char *section_end = stcp->hlrecp->start ? stcp->hlrecp->start : stcp->text_end; stcp->textp = stcp->hlrecp->start ? stcp->hlrecp->start : stcp->text_end;
ptrdiff_t len = section_end - text; ptrdiff_t len = stcp->textp - start;
// Prepare for next highlight section if not yet at the end // Prepare for next highlight section if not yet at the end
if (section_end < stcp->text_end) { if (stcp->textp < stcp->text_end) {
int hl = stcp->hlrecp->userhl; int hl = stcp->hlrecp->userhl;
stcp->textp = stcp->hlrecp->start;
stcp->cur_attr = hl < 0 ? syn_id2attr(-hl) : stcp->num_attr; stcp->cur_attr = hl < 0 ? syn_id2attr(-hl) : stcp->num_attr;
stcp->hlrecp++; stcp->hlrecp++;
} else {
stcp->textp = section_end;
} }
// Skip over empty highlight sections // Skip over empty highlight sections
if (len) { if (len) {
static char transbuf[(MAX_NUMBERWIDTH + 9 + 9 * SIGN_WIDTH) * MB_MAXBYTES + 1]; static char transbuf[(MAX_NUMBERWIDTH + 9 + 9 * SIGN_WIDTH) * MB_MAXBYTES + 1];
size_t translen = transstr_buf(text, len, transbuf, sizeof transbuf, true); size_t translen = transstr_buf(start, len, transbuf, sizeof transbuf, true);
draw_col_buf(wp, wlv, transbuf, translen, attr, false); draw_col_buf(wp, wlv, transbuf, translen, attr, false);
} }
} while (stcp->textp < stcp->text_end); } while (stcp->textp < stcp->text_end);
@ -1582,7 +1578,6 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool number_onl
win_col_offset = wlv.off; win_col_offset = wlv.off;
// Check if 'breakindent' applies and show it. // Check if 'breakindent' applies and show it.
// May change wlv.draw_state to WL_BRI or WL_BRI - 1.
if (!wp->w_briopt_sbr) { if (!wp->w_briopt_sbr) {
handle_breakindent(wp, &wlv); handle_breakindent(wp, &wlv);
} }