From c2e76d0937b578c9af7b8d08c4d9f344ce59e360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20F=2E=20Bortl=C3=ADk?= <jakub.bortlik@proton.me>
Date: Fri, 27 Feb 2026 14:40:16 +0100
Subject: [PATCH] fix: highlight individual lines

---
 lua/gitlab/actions/summary.lua | 68 ++++++++++++++++++++++++++--------
 lua/gitlab/utils/init.lua      |  4 +-
 2 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/lua/gitlab/actions/summary.lua b/lua/gitlab/actions/summary.lua
index dc67220..42b52d4 100644
--- a/lua/gitlab/actions/summary.lua
+++ b/lua/gitlab/actions/summary.lua
@@ -11,6 +11,9 @@ local popup = require("gitlab.popup")
 local state = require("gitlab.state")
 local miscellaneous = require("gitlab.actions.miscellaneous")
 
+-- No-break space used in summary details to make matching different parts of the line more robust
+local nbsp = " "
+
 local M = {
   layout_visible = false,
   layout = nil,
@@ -173,15 +176,15 @@ M.build_info_lines = function()
       u.notify(string.format("Invalid field in settings.info.fields: '%s'", v), vim.log.levels.ERROR)
     else
       local title = options[v].title
-      if string.len(title) > string.len(longest_used) then
+      if vim.fn.strcharlen(title) > vim.fn.strcharlen(longest_used) then
         longest_used = title
       end
     end
   end
 
   local function row_offset(row)
-    local offset = string.len(longest_used) - string.len(row)
-    return string.rep(" ", offset + 3)
+    local offset = vim.fn.strcharlen(longest_used) - vim.fn.strcharlen(row)
+    return string.rep(nbsp, offset + 3)
   end
 
   local result = {}
@@ -194,7 +197,7 @@ M.build_info_lines = function()
     local content = type(row.content) == "function" and row.content() or row.content
     if type(content) == "table" then
       -- Multi-line content
-      local padding = string.rep(" ", #title_prefix)
+      local padding = string.rep(nbsp, vim.fn.strcharlen(title_prefix)) -- no-break space
       for i, line in ipairs(#content > 0 and content or { "" }) do
         table.insert(result, (i == 1 and title_prefix or padding) .. line)
       end
@@ -290,24 +293,57 @@ end
 
 M.color_details = function(bufnr)
   local details_namespace = vim.api.nvim_create_namespace("Details")
-  for i, v in ipairs(state.settings.info.fields) do
-    if v == "labels" then
-      local line_content = u.get_line_content(bufnr, i)
+  for i, line in ipairs(vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)) do
+    if line:match("^* Labels") then
       for j, label in ipairs(state.LABELS) do
-        local start_idx, end_idx = line_content:find(label.Name)
+        local start_idx, end_idx = line:find(label.Name, 1, true)
         if start_idx ~= nil and end_idx ~= nil then
           vim.cmd("highlight " .. "label" .. j .. " guifg=white")
           vim.api.nvim_set_hl(0, ("label" .. j), { fg = label.Color })
-          vim.api.nvim_buf_add_highlight(bufnr, details_namespace, ("label" .. j), i - 1, start_idx - 1, end_idx)
+          vim.hl.range(bufnr, details_namespace, ("label" .. j), { i - 1, start_idx - 1 }, { i - 1, end_idx })
         end
       end
-    elseif v == "delete_branch" or v == "squash" or v == "draft" or v == "conflicts" then
-      local line_content = u.get_line_content(bufnr, i)
-      local start_idx, end_idx = line_content:find("%S-$")
-      if start_idx ~= nil and end_idx ~= nil then
-        vim.api.nvim_set_hl(0, "boolean", { link = "Constant" })
-        vim.api.nvim_buf_add_highlight(bufnr, details_namespace, "boolean", i - 1, start_idx - 1, end_idx)
-      end
+    elseif line:match("^* Status") then
+      local status = line:match("[^" .. nbsp .. "]-$")
+      local hl = ({
+        blocked_status = "DiagnosticError",
+        broken_status = "DiagnosticError",
+        checking = "DiagnosticInfo",
+        ci_must_pass = "DiagnosticWarn",
+        ci_still_running = "DiagnosticInfo",
+        discussions_not_resolved = "DiagnosticWarn",
+        draft_status = "Comment",
+        external_status_checks = "DiagnosticHint",
+        mergeable = "DiagnosticOK",
+        not_approved = "DiagnosticWarn",
+        not_open = "NonText",
+        policies_denied = "DiagnosticError",
+        unchecked = "NonText",
+      })[status] or "Normal"
+      local start_idx, end_idx = line:find("[^" .. nbsp .. "]-$")
+      vim.hl.range(bufnr, details_namespace, hl, { i - 1, start_idx - 1 }, { i - 1, end_idx })
+    elseif line:match("^* Branch") or line:match("^* Target Branch") then
+      local start_idx, end_idx = line:find("[^" .. nbsp .. "]-$")
+      vim.hl.range(bufnr, details_namespace, "Title", { i - 1, start_idx - 1 }, { i - 1, end_idx })
+    elseif line:match("^* Pipeline") then
+      local status = line:match("[^" .. nbsp .. "]-$")
+      local hl = ({
+        canceled = "DiagnosticWarn",
+        created = "DiagnosticInfo",
+        failed = "DiagnosticError",
+        manual = "DiagnosticHint",
+        pending = "DiagnosticWarn",
+        running = "DiagnosticInfo",
+        skipped = "Comment",
+        success = "DiagnosticOK",
+        unknown = "NonText",
+      })[status] or "Normal"
+      local start_idx, end_idx = line:find("[^" .. nbsp .. "]-$")
+      vim.hl.range(bufnr, details_namespace, hl, { i - 1, start_idx - 1 }, { i - 1, end_idx })
+    elseif line:match(nbsp .. "No$") or line:match(nbsp .. "Yes$") then
+      local start_idx, end_idx = line:find("[^" .. nbsp .. "]-$")
+      vim.api.nvim_set_hl(0, "boolean", { link = "Constant" })
+      vim.hl.range(bufnr, details_namespace, "boolean", { i - 1, start_idx - 1 }, { i - 1, end_idx })
     end
   end
 end
diff --git a/lua/gitlab/utils/init.lua b/lua/gitlab/utils/init.lua
index 09054c9..a1e61a9 100644
--- a/lua/gitlab/utils/init.lua
+++ b/lua/gitlab/utils/init.lua
@@ -309,8 +309,8 @@ end
 M.get_longest_string = function(list)
   local longest = 0
   for _, v in pairs(list) do
-    if string.len(v) > longest then
-      longest = string.len(v)
+    if vim.fn.strcharlen(v) > longest then
+      longest = vim.fn.strcharlen(v)
     end
   end
   return longest