brew.patch

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 9806623..5593371 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -3010,7 +3010,7 @@ int build_stl_str_hl(
           && item[groupitem[groupdepth]].minwid == 0) {
         bool has_normal_items = false;
         for (long n = groupitem[groupdepth] + 1; n < curitem; n++) {
-          if (item[n].type == Normal) {
+          if (item[n].type == Normal || item[n].type == Highlight) {
             has_normal_items = true;
             break;
           }

buffer.patch

diff --git src/nvim/buffer.c src/nvim/buffer.c
index 9806623..5593371 100644
--- src/nvim/buffer.c
+++ src/nvim/buffer.c
@@ -3010,7 +3010,7 @@ int build_stl_str_hl(
           && item[groupitem[groupdepth]].minwid == 0) {
         bool has_normal_items = false;
         for (long n = groupitem[groupdepth] + 1; n < curitem; n++) {
-          if (item[n].type == Normal) {
+          if (item[n].type == Normal || item[n].type == Highlight) {
             has_normal_items = true;
             break;
           }