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

fix(test): use valid hex hash in combined diff fixtures (#171)

Browse source 
## Problem

Combined diff test fixtures used `ghi9012` as a result hash, but `g`,
`h`, `i` are not hex digits (`%x` matches `[0-9a-fA-F]`). The `%x+`
pattern in `highlight.lua` correctly rejected this, so the manual
`@constant.diff` extmark for the result hash was never set. The existing
assertion passed anyway because the diff grammar's captures on parent
hashes (`abc1234`, `def5678`) satisfied the row-level check.

## Solution

Replace `ghi9012` with valid hex `a6b9012` in all fixtures. Tighten the
result hash assertion to verify exact column range (cols 23-30) so it
cannot be satisfied by parent hash captures.

Closes #168
This commit is contained in:
Barrett Ruth 2026-03-06 14:12:20 -05:00 • committed by GitHub
parent d584d816bf
commit 823743192a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
spec/highlight_spec.lua
View file

@ -1654,7 +1654,7 @@ describe('highlight', function()
it('applies DiffsClear to headers for combined diffs', function()
local bufnr = create_buffer({
'diff --combined lua/merge/target.lua',
'index abc1234,def5678..ghi9012',
'index abc1234,def5678..a6b9012',
'--- a/lua/merge/target.lua',
'+++ b/lua/merge/target.lua',
'@@@ -1,2 -1,2 +1,3 @@@',
@ -1671,7 +1671,7 @@ describe('highlight', function()
header_start_line = 1,
header_lines = {
'diff --combined lua/merge/target.lua',
'index abc1234,def5678..ghi9012',
'index abc1234,def5678..a6b9012',
'--- a/lua/merge/target.lua',
'+++ b/lua/merge/target.lua',
},
@ -1755,7 +1755,7 @@ describe('highlight', function()
it('applies header diff grammar at syntax priority for combined diffs', function()
local bufnr = create_buffer({
'diff --combined lua/merge/target.lua',
'index abc1234,def5678..ghi9012',
'index abc1234,def5678..a6b9012',
'--- a/lua/merge/target.lua',
'+++ b/lua/merge/target.lua',
'@@@ -1,2 -1,2 +1,3 @@@',
@ -1772,7 +1772,7 @@ describe('highlight', function()
header_start_line = 1,
header_lines = {
'diff --combined lua/merge/target.lua',
'index abc1234,def5678..ghi9012',
'index abc1234,def5678..a6b9012',
'--- a/lua/merge/target.lua',
'+++ b/lua/merge/target.lua',
},
@ -1802,7 +1802,7 @@ describe('highlight', function()
it('@diff.minus wins over @punctuation.special on combined diff headers', function()
local bufnr = create_buffer({
'diff --combined lua/merge/target.lua',
'index abc1234,def5678..ghi9012',
'index abc1234,def5678..a6b9012',
'--- a/lua/merge/target.lua',
'+++ b/lua/merge/target.lua',
'@@@ -1,2 -1,2 +1,3 @@@',
@ -1819,7 +1819,7 @@ describe('highlight', function()
header_start_line = 1,
header_lines = {
'diff --combined lua/merge/target.lua',
'index abc1234,def5678..ghi9012',
'index abc1234,def5678..a6b9012',
'--- a/lua/merge/target.lua',
'+++ b/lua/merge/target.lua',
},
@ -1862,7 +1862,7 @@ describe('highlight', function()
it('applies @keyword.diff on index word for combined diffs', function()
local bufnr = create_buffer({
'diff --combined lua/merge/target.lua',
'index abc1234,def5678..ghi9012',
'index abc1234,def5678..a6b9012',
'--- a/lua/merge/target.lua',
'+++ b/lua/merge/target.lua',
'@@@ -1,2 -1,2 +1,3 @@@',
@ -1879,7 +1879,7 @@ describe('highlight', function()
header_start_line = 1,
header_lines = {
'diff --combined lua/merge/target.lua',
'index abc1234,def5678..ghi9012',
'index abc1234,def5678..a6b9012',
'--- a/lua/merge/target.lua',
'+++ b/lua/merge/target.lua',
},
@ -1908,7 +1908,7 @@ describe('highlight', function()
it('applies @constant.diff on result hash for combined diffs', function()
local bufnr = create_buffer({
'diff --combined lua/merge/target.lua',
'index abc1234,def5678..ghi9012',
'index abc1234,def5678..a6b9012',
'--- a/lua/merge/target.lua',
'+++ b/lua/merge/target.lua',
'@@@ -1,2 -1,2 +1,3 @@@',
@ -1925,7 +1925,7 @@ describe('highlight', function()
header_start_line = 1,
header_lines = {
'diff --combined lua/merge/target.lua',
'index abc1234,def5678..ghi9012',
'index abc1234,def5678..a6b9012',
'--- a/lua/merge/target.lua',
'+++ b/lua/merge/target.lua',
},
@ -1934,14 +1934,21 @@ describe('highlight', function()
highlight.highlight_hunk(bufnr, ns, hunk, default_opts())
local extmarks = get_extmarks(bufnr)
local has_constant = false
local has_result_hash = false
for _, mark in ipairs(extmarks) do
local d = mark[4]
if mark[2] == 1 and d and d.hl_group == '@constant.diff' and (d.priority or 0) >= 199 then
has_constant = true
if
mark[2] == 1
and mark[3] == 23
and d
and d.hl_group == '@constant.diff'
and d.end_col == 30
and (d.priority or 0) >= 199
then
has_result_hash = true
end
end
assert.is_true(has_constant, '@constant.diff on result hash')
assert.is_true(has_result_hash, '@constant.diff on result hash at cols 23-30')
delete_buffer(bufnr)
end)
end)