fix: correct strdisplaywidth calculation for signs

rachartier · Feb 23, 2025 · d161597 · d161597
1 parent 3d849ce
commit d161597
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lua/tiny-inline-diagnostic/diagnostic.lua b/lua/tiny-inline-diagnostic/diagnostic.lua
@@ -150,7 +150,6 @@ local function apply_virtual_texts(opts, event)
 	local filtered_diags = filter_diagnostics(opts, event, diagnostics)
 	local cursor_line = vim.api.nvim_win_get_cursor(0)[1] - 1
 	local visible_diags = get_visible_diagnostics(filtered_diags)
-	local signs_offset = vim.fn.strdisplaywidth(opts.signs.left) + vim.fn.strdisplaywidth(opts.signs.arrow)
 
 	-- Clear existing extmarks
 	extmarks.clear(event.buf)
@@ -189,6 +188,13 @@ local function apply_virtual_texts(opts, event)
 		local offset = data.offset
 		local need_to_be_under = data.need_to_be_under
 		local diagnostic_pos = data.diagnostic_pos
+		local signs_offset = 0
+
+		if need_to_be_under then
+			signs_offset = vim.fn.strdisplaywidth(opts.signs.left)
+		else
+			signs_offset = vim.fn.strdisplaywidth(opts.signs.left) + vim.fn.strdisplaywidth(opts.signs.arrow)
+		end
 
 		extmarks.create_extmarks(
 			opts,

diff --git a/lua/tiny-inline-diagnostic/virtual_text.lua b/lua/tiny-inline-diagnostic/virtual_text.lua
@@ -49,7 +49,7 @@ local function build_first_chunk(opts, chunk_info, message, hl, index_diag, tota
 
 	if index_diag == 1 then
 		local cursor_line = vim.api.nvim_win_get_cursor(0)[1] - 1
-		local chunk_arrow = chunk_utils.get_arrow_from_chunk(opts, cursor_line, chunk_info, hl.diag_hi)
+		local chunk_arrow = chunk_utils.get_arrow_from_chunk(opts, cursor_line, chunk_info, hl.diag_inv_hi)
 
 		if type(chunk_arrow[1]) == "table" then
 			return { chunk_arrow, chunk_header }