barrett/diffs.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: format

Browse source
This commit is contained in:
Barrett Ruth 2026-03-05 10:31:00 -05:00
parent a6433da5f4
commit af3e186ecb
Signed by: barrett
GPG key ID: A6C96C9349D2FC81
3 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lua/diffs/highlight.lua
View file

@ -371,7 +371,17 @@ function M.highlight_hunk(bufnr, ns, hunk, opts)
header_map[i] = hunk.header_start_line - 1 + i header_map[i] = hunk.header_start_line - 1 + i
end end
extmark_count = extmark_count extmark_count = extmark_count
+ highlight_treesitter(bufnr, ns, hunk.header_lines, 'diff', header_map, qw, nil, p, qw > 0 or pw > 1) + highlight_treesitter(
bufnr,
ns,
hunk.header_lines,
'diff',
header_map,
qw,
nil,
p,
qw > 0 or pw > 1
)
end end
local at_raw_line local at_raw_line
@ -574,11 +584,12 @@ function M.highlight_hunk(bufnr, ns, hunk, opts)
char_hl, char_hl,
line:sub(span.col_start + 1, span.col_end) line:sub(span.col_start + 1, span.col_end)
) )
local ok, err = pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, buf_line, span.col_start + qw, { local ok, err =
end_col = span.col_end + qw, pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, buf_line, span.col_start + qw, {
hl_group = char_hl, end_col = span.col_end + qw,
priority = p.char_bg, hl_group = char_hl,
}) priority = p.char_bg,
})
if not ok then if not ok then
dbg('char extmark FAILED: %s', err) dbg('char extmark FAILED: %s', err)
end end

5
lua/diffs/parser.lua
View file

@ -241,7 +241,10 @@ function M.parse_buffer(bufnr)
or logical:match('^renamed%s+(.+)$') or logical:match('^renamed%s+(.+)$')
or logical:match('^copied%s+(.+)$') or logical:match('^copied%s+(.+)$')
local bare_file = not hunk_start and logical:match('^([^%s]+%.[^%s]+)$') local bare_file = not hunk_start and logical:match('^([^%s]+%.[^%s]+)$')
local filename = logical:match('^[MADRCU%?!]%s+(.+)$') or diff_git_file or neogit_file or bare_file local filename = logical:match('^[MADRCU%?!]%s+(.+)$')
or diff_git_file
or neogit_file
or bare_file
if filename then if filename then
flush_hunk() flush_hunk()
current_filename = filename current_filename = filename

11
spec/email_quote_spec.lua
View file

@ -1,6 +1,6 @@
require('spec.helpers') require('spec.helpers')
local parser = require('diffs.parser')
local highlight = require('diffs.highlight') local highlight = require('diffs.highlight')
local parser = require('diffs.parser')
describe('email-quoted diffs', function() describe('email-quoted diffs', function()
local function create_buffer(lines) local function create_buffer(lines)
@ -348,7 +348,10 @@ describe('email-quoted diffs', function()
for _, mark in ipairs(extmarks) do for _, mark in ipairs(extmarks) do
local d = mark[4] local d = mark[4]
if d and (d.hl_group == '@diff.plus' or d.hl_group == '@diff.minus') then if d and (d.hl_group == '@diff.plus' or d.hl_group == '@diff.minus') then
table.insert(diff_marks, { row = mark[2], col = mark[3], end_col = d.end_col, hl = d.hl_group }) table.insert(
diff_marks,
{ row = mark[2], col = mark[3], end_col = d.end_col, hl = d.hl_group }
)
end end
end end
assert.is_true(#diff_marks >= 2) assert.is_true(#diff_marks >= 2)
@ -416,7 +419,9 @@ describe('email-quoted diffs', function()
bufnr, bufnr,
ns, ns,
hunk, hunk,
default_opts({ highlights = { intra = { enabled = true, algorithm = 'default', max_lines = 500 } } }) default_opts({
highlights = { intra = { enabled = true, algorithm = 'default', max_lines = 500 } },
})
) )
local extmarks = get_extmarks(bufnr) local extmarks = get_extmarks(bufnr)