Skip to content

fix(highlight): use file context for header text treesitter parsing #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barrettruth merged 3 commits into from
Mar 20, 2026
Merged

fix(highlight): use file context for header text treesitter parsing #197

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2535aea
fix(highlight): use file context for header text treesitter parsing
barrettruth Mar 20, 2026
961037d
ci: format
barrettruth Mar 20, 2026
7699ffe
Merge branch 'main' into fix/header-context-highlight
barrettruth Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions lua/diffs/highlight.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,30 @@ local diff = require('diffs.diff')
---@param lang string
---@param context_lines? string[]
---@param priorities diffs.PrioritiesConfig
---@param context_before? string[]
---@return integer
local function highlight_text(bufnr, ns, hunk, col_offset, text, lang, context_lines, priorities)
local parse_text = text
local function highlight_text(
bufnr,
ns,
hunk,
col_offset,
text,
lang,
context_lines,
priorities,
context_before
)
local prefix_count = 0
local parts = {}
if context_before and #context_before > 0 then
prefix_count = #context_before
parts[#parts + 1] = table.concat(context_before, '\n')
end
parts[#parts + 1] = text
if context_lines and #context_lines > 0 then
parse_text = text .. '\n' .. table.concat(context_lines, '\n')
parts[#parts + 1] = table.concat(context_lines, '\n')
end
local parse_text = table.concat(parts, '\n')

local ok, parser_obj = pcall(vim.treesitter.get_string_parser, parse_text, lang)
if not ok or not parser_obj then
Expand All @@ -35,10 +53,11 @@ local function highlight_text(bufnr, ns, hunk, col_offset, text, lang, context_l

local extmark_count = 0
local header_line = hunk.start_line - 1
local target_row = prefix_count

for id, node, metadata in query:iter_captures(trees[1]:root(), parse_text) do
local sr, sc, _, ec = node:range()
if sr == 0 then
if sr == target_row then
local capture_name = '@' .. query.captures[id] .. '.' .. lang

local buf_sr = header_line
Expand Down Expand Up @@ -412,7 +431,8 @@ function M.highlight_hunk(bufnr, ns, hunk, opts)
hunk.header_context,
hunk.lang,
new_code,
p
p,
hunk.context_before
)
if header_extmarks > 0 then
dbg('header %s:%d applied %d extmarks', hunk.filename, hunk.start_line, header_extmarks)
Expand Down
Loading