Skip to content

test: reuse runtime fixtures for base conflict colors #494

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 1 commit into from
Nov 9, 2026
Merged

test: reuse runtime fixtures for base conflict colors #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 0 additions & 55 deletions spec/highlight_groups_spec.lua
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions spec/runtime_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,21 @@ describe('diffs.runtime', function()
assert.is_number(set_calls.DiffsDeleteBar.bg)
end)

it('uses deletion colors for base numbers on background-only themes', function()
local source = {
DiffChange = { bg = 0x565f73 },
DiffText = { bg = 0x52494e },
diffRemoved = { fg = 0xd08080 },
}
vim.api.nvim_get_hl = function(ns, opts)
return source[opts.name] or saved_get_hl(ns, opts)
end
runtime._test.compute_highlight_groups()
assert.are.equal(0xd08080, set_calls.DiffsConflictBaseNr.fg)
assert.are.equal(0x80a0c0, set_calls.DiffsConflictTheirsNr.fg)
assert.are.equal(set_calls.DiffsConflictBase.bg, set_calls.DiffsConflictBaseNr.bg)
end)

it('blend_alpha controls DiffsAdd.bg intensity', function()
local saved_config_alpha = runtime._test.get_config().highlights.blend_alpha
runtime._test.get_config().highlights.blend_alpha = 0.3
Expand Down
Loading