From: Andy Koppe Date: Wed, 18 Nov 2026 09:48:02 GMT Subject: Re: [PATCH v2] utf8: add display_mode_esc_sequence_len_counted() Message-ID: In-Reply-To: Dirk Gouders > On Wed, Nov 18 2026, Andy Koppe wrote: > > > Junio C Hamano wrote: > >> > >> Andy Koppe writes: > >> > >> > Junio C Hamano wrote: > >> > > >> >> - while (isdigit(*p) || *p == ';') > >> >> + while (p < end && (isdigit(*p) || *p == ';')) > >> > > >> > While you're there, could you add colons (':') to that? > >> > >> Do we generate such a sequence that uses subseparators? > >> > >> IIRC, this code is not counting the display width of end-user > >> supplied string. Rather, it gets string we paint in a buffer and > >> then counts how much display column it occupies. > > > > You're right that Git itself doesn't generate them (although future > > enhancements might change that). > > > > However, display_mode_esc_sequence_len() already operates on expanded > > custom formats and message text, e.g. in rewrap_message_tail() via > > strbuf_wrap(). And on stdin in git-column. They could all contain SGR > > sequences with colons, whose width currently isn't ignored as > > intended. (And my proposed make_line_colors_self_contained() wouldn't > > reset or replay them.) > > > > The check could be changed to `*p >= '0' && *p<=';'` to cheaply include colons. > > I would suggest to not mix these changes simply for bisection purposes. Fair, and there's testing work as well of course. It was silly of me to suggest just sneaking that change in. > And as far as I know, we would need an FSM to identify valid sequences > if we are going to allow colons. No. The parameter field can be any mix of digits, colons and semicolons. Semicolons separate parameters, colons separate subparameters, and individual (sub)parameters can be empty, which is equivalent to zero. If the field consists of nothing but colons, that's one parameter with multiple empty subparameters. Whether any particular SGR sequence means anything to a terminal is another matter of course, but git doesn't try to determine that for colon-less sequences either, and nor should it. Well-behaved terminals ignore valid sequences they don't understand. Andy