fix(init): remove NeogitDiffContextHighlight override workaround (#147)
## Problem diffs.nvim blanked `NeogitDiffContextHighlight` globally on attach and on `ColorScheme` to work around Neogit's `ViewContext` decoration provider overriding `DiffsAdd`/`DiffsDelete` line backgrounds with `NeogitDiffContextHighlight` at priority 200. ## Solution Remove the `override_neogit_context_highlights` workaround. NeogitOrg/neogit#1907 moves the `neogit_disable_hunk_highlight` check inside ViewContext's per-line loop, so non-cursor lines skip `add_line_highlight` entirely. `vim.b[bufnr].neogit_disable_hunk_highlight = true` (set on attach) is sufficient. Closes #135
This commit is contained in:
parent
90b312e8df
commit
70d5bee797
1 changed files with 0 additions and 12 deletions
|
|
@ -489,14 +489,6 @@ local function compute_highlight_groups()
|
|||
end
|
||||
end
|
||||
|
||||
local neogit_context_hl_overridden = false
|
||||
|
||||
-- TODO: remove once NeogitOrg/neogit#1904 merges and is released (tracked in #135)
|
||||
local function override_neogit_context_highlights()
|
||||
vim.api.nvim_set_hl(0, 'NeogitDiffContextHighlight', {})
|
||||
neogit_context_hl_overridden = true
|
||||
end
|
||||
|
||||
local function init()
|
||||
if initialized then
|
||||
return
|
||||
|
|
@ -720,9 +712,6 @@ local function init()
|
|||
vim.api.nvim_create_autocmd('ColorScheme', {
|
||||
callback = function()
|
||||
compute_highlight_groups()
|
||||
if neogit_context_hl_overridden then
|
||||
override_neogit_context_highlights()
|
||||
end
|
||||
for bufnr, _ in pairs(attached_buffers) do
|
||||
invalidate_cache(bufnr)
|
||||
end
|
||||
|
|
@ -848,7 +837,6 @@ function M.attach(bufnr)
|
|||
local neogit_augroup = nil
|
||||
if config.neogit and vim.bo[bufnr].filetype:match('^Neogit') then
|
||||
vim.b[bufnr].neogit_disable_hunk_highlight = true
|
||||
override_neogit_context_highlights()
|
||||
neogit_augroup = vim.api.nvim_create_augroup('diffs_neogit_' .. bufnr, { clear = true })
|
||||
vim.api.nvim_create_autocmd('User', {
|
||||
pattern = 'NeogitDiffLoaded',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue