From a0de5cbbdd4530cbc4f637624e63b624b62b5de6 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Fri, 13 Oct 2023 15:42:43 +0200 Subject: [PATCH] skip empty cells before applying a style Fix empty cells erroneously being styled. The view_style function is used to apply styles to ranges of text in a view. It approaches the starting position where the style should be applied by iterating the columns in the appropriate line using this while loop: while (pos < start && col < width) pos += line->cells[col++].len; The while loop will stop at the last character before the range where the style should be applied. This works fine until we encounter "empty" cells between the last cell containing an actual character and the first cell to be styled. This can happen if the last character before the range to style is '\t' which gets expanded with empty cells by vis according to the tabwidth option. Those empty cells get erroneously styled as well. This is fixed by skipping all empty cells encountered before the range to style. --- view.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view.c b/view.c index 5fa512bfc..a60466ae2 100644 --- a/view.c +++ b/view.c @@ -1429,6 +1429,10 @@ void view_style(View *view, enum UiStyle style_id, size_t start, size_t end) { while (pos < start && col < width) pos += line->cells[col++].len; + /* skip empty columns */ + while (!line->cells[col].len && col < width) + col++; + do { while (pos <= end && col < width) { pos += line->cells[col].len;