fix(highlights)!: improve handling of cursorline background

Author: rachartier

.beads/issues.jsonl

@@ -0,0 +1,3 @@
+{"id":"tiny-inline-diagnostic.nvim-ciu","content_hash":"b1bae68097b016c449d1eaf521de63eafc097bec5eb78663fcdee27199adb1e8","title":"Run test suite validation","description":"Execute full test suite to verify 187 tests still pass after refactoring","status":"open","priority":1,"issue_type":"task","created_at":"2025-11-09T11:10:39.334213939+01:00","updated_at":"2025-11-09T11:10:39.334213939+01:00","source_repo":"."}
+{"id":"tiny-inline-diagnostic.nvim-kxl","content_hash":"43d7069fb55ce9a9b2063a45053dc895db5773821716a45b3d4247b2d9e9c0c3","title":"Refactor chunk.lua to facade pattern","description":"Transform chunk.lua to re-export functions from new submodules while maintaining API compatibility","status":"in_progress","priority":1,"issue_type":"task","created_at":"2025-11-09T11:10:38.252467341+01:00","updated_at":"2025-11-09T11:10:43.080627553+01:00","source_repo":"."}
+{"id":"tiny-inline-diagnostic.nvim-vpy","content_hash":"ad527f313f04f728beb5b3858cd83bd4d529175dace46bf3ed6f901c6a16c08e","title":"Analyze issue #158: diagnostics not showing with basedpyright","description":"Investigate why tiny-inline-diagnostic.nvim shows for nixd but not basedpyright. Review setup order, event triggers, buffer attach logic, diagnostic fields.","status":"in_progress","priority":2,"issue_type":"task","created_at":"2025-11-22T16:50:20.70267504+01:00","updated_at":"2025-11-22T16:50:22.407223959+01:00","source_repo":"."}

lua/tiny-inline-diagnostic/chunk.lua

@@ -435,10 +435,13 @@ function M.get_chunks(opts, diags_on_line, diag_index, diag_line, cursor_line, b
 
   local other_extmarks_offset = extmarks.handle_other_extmarks(buf, diag_line, line_length)
 
-  local multilines_enabled = type(opts.options.multilines) == "table" and opts.options.multilines.enabled
+  local multilines_enabled = type(opts.options.multilines) == "table"
+      and opts.options.multilines.enabled
     or opts.options.multilines
 
-  if (opts.options.overflow.mode ~= "none" and not multilines_enabled) or cursor_line == diag_line then
+  if
+    (opts.options.overflow.mode ~= "none" and not multilines_enabled) or cursor_line == diag_line
+  then
     local line_display_width = lines[1] and vim.fn.strdisplaywidth(lines[1]) or 0
     local visual_line_width = line_display_width + other_extmarks_offset
 

lua/tiny-inline-diagnostic/highlighter_builder.lua

@@ -41,6 +41,12 @@ function M.build_base_groups(colors, blends, transparent)
       italic = color.italic,
     }
 
+    hi[INV_HIGHLIGHT_PREFIX .. name .. "CursorLine"] = {
+      fg = blends[name_lower],
+      bg = colors.cursor_line.bg,
+      italic = color.italic,
+    }
+
     hi[INV_HIGHLIGHT_PREFIX .. name .. "NoBg"] = {
       fg = blends[name_lower],
       bg = "None",
@@ -49,7 +55,7 @@ function M.build_base_groups(colors, blends, transparent)
   end
 
   hi[HIGHLIGHT_PREFIX .. "Arrow"] = {
-    bg = colors.background,
+    bg = colors.cursor_line.bg,
     fg = colors.arrow.fg,
   }
   hi[HIGHLIGHT_PREFIX .. "ArrowNoBg"] = {

lua/tiny-inline-diagnostic/highlights.lua

@@ -74,26 +74,32 @@ end
 
 ---@param blend BlendOptions
 ---@param default_hi DefaultHighlights
-function M.setup_highlights(blend, default_hi, transparent_bg, transparent_cursorline)
-  -- Get base colors
+function M.setup_highlights(blend, default_hi, transparent_bg)
+  if not transparent_bg then
+    transparent_bg = false
+  end
+
+  if blend.factor == 0 then
+    transparent_bg = true
+  end
+
+  local cursorline_hl = get_highlight("CursorLine")
+  local is_cursorline_enabled = vim.opt.cursorline:get()
+  local has_cursorline_bg = cursorline_hl.bg ~= "None"
+
+  local cursor_line_color = (is_cursorline_enabled and has_cursorline_bg) and cursorline_hl
+    or { bg = "None" }
+
   local colors = {
     error = get_highlight(default_hi.error),
     warn = get_highlight(default_hi.warn),
     info = get_highlight(default_hi.info),
     hint = get_highlight(default_hi.hint),
     ok = get_highlight(default_hi.ok),
     arrow = get_highlight(default_hi.arrow),
-    cursor_line = transparent_cursorline and { bg = "None" } or get_highlight("CursorLine"),
+    cursor_line = cursor_line_color,
   }
 
-  if not transparent_bg then
-    transparent_bg = false
-  end
-
-  if blend.factor == 0 then
-    transparent_bg = true
-  end
-
   -- Get special colors
   colors.background = get_background_color(default_hi.background)
   colors.mixing_color = get_mixing_color(default_hi.mixing_color)
@@ -127,8 +133,11 @@ end
 function M.get_diagnostic_highlights(blend_factor, diag_ret, curline, index_diag)
   local diag_hi, diag_inv_hi, body_hi = M.get_diagnostic_highlights_from_severity(diag_ret.severity)
 
-  if (diag_ret.line and diag_ret.line == curline) and index_diag == 1 and blend_factor == 0 then
-    diag_hi = diag_hi .. "CursorLine"
+  if (diag_ret.line and diag_ret.line == curline) and index_diag == 1 then
+    if blend_factor == 0 then
+      diag_hi = diag_hi .. "CursorLine"
+    end
+    diag_inv_hi = diag_inv_hi .. "CursorLine"
   end
 
   if

lua/tiny-inline-diagnostic/init.lua

@@ -13,7 +13,6 @@ local presets = require("tiny-inline-diagnostic.presets")
 local default_config = {
   preset = "modern",
   transparent_bg = false,
-  transparent_cursorline = true,
   hi = {
     error = "DiagnosticError",
     warn = "DiagnosticWarn",
@@ -84,12 +83,7 @@ local function setup_colorscheme_handler(config)
   vim.api.nvim_create_autocmd("ColorScheme", {
     pattern = "*",
     callback = function()
-      hi.setup_highlights(
-        config.blend,
-        config.hi,
-        config.transparent_bg,
-        config.transparent_cursorline
-      )
+      hi.setup_highlights(config.blend, config.hi, config.transparent_bg)
     end,
   })
 end
@@ -137,7 +131,7 @@ function M.setup(opts)
 
   M.config = config
 
-  hi.setup_highlights(config.blend, config.hi, config.transparent_bg, config.transparent_cursorline)
+  hi.setup_highlights(config.blend, config.hi, config.transparent_bg)
 
   setup_colorscheme_handler(config)
   diag.set_diagnostic_autocmds(config)
@@ -157,7 +151,7 @@ function M.change(blend, highlights)
     hi = highlights or M.config.hi,
   })
 
-  hi.setup_highlights(config.blend, config.hi, config.transparent_bg, config.transparent_cursorline)
+  hi.setup_highlights(config.blend, config.hi, config.transparent_bg)
 end
 
 --- Enable the diagnostic display.