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

feat(neojj): add neojj (jujutsu) integration

Browse source 
Problem: diffs.nvim has no support for neojj, the neogit-like TUI for
jujutsu VCS. Users switching to jj get no syntax highlighting in neojj
status/diff buffers.

Solution: Mirror the existing neogit integration pattern for neojj.
Register `NeojjStatus`, `NeojjCommitView`, `NeojjDiffView` filetypes,
set `vim.b.neojj_disable_hunk_highlight` on attach, listen for
`User NeojjDiffLoaded` events, and detect jj repo root via
`neojj.lib.jj.repo.worktree_root`. Add parser patterns for neojj's
`added`, `updated`, `changed`, and `unmerged` filename labels.
This commit is contained in:
Barrett Ruth 2026-03-11 14:01:28 -04:00
parent de04381298
commit 5da3929480
Signed by: barrett
GPG key ID: A6C96C9349D2FC81
5 changed files with 265 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

44
lua/diffs/init.lua
View file

@ -39,6 +39,8 @@
---@class diffs.NeogitConfig
---@class diffs.NeojjConfig
---@class diffs.GitsignsConfig
---@class diffs.CommittiaConfig
@ -65,6 +67,7 @@
---@class diffs.IntegrationsConfig
---@field fugitive diffs.FugitiveConfig|false
---@field neogit diffs.NeogitConfig|false
---@field neojj diffs.NeojjConfig|false
---@field gitsigns diffs.GitsignsConfig|false
---@field committia diffs.CommittiaConfig|false
---@field telescope diffs.TelescopeConfig|false
@ -77,6 +80,7 @@
---@field integrations diffs.IntegrationsConfig
---@field fugitive? diffs.FugitiveConfig|false deprecated: use integrations.fugitive
---@field neogit? diffs.NeogitConfig|false deprecated: use integrations.neogit
---@field neojj? diffs.NeojjConfig|false deprecated: use integrations.neojj
---@field gitsigns? diffs.GitsignsConfig|false deprecated: use integrations.gitsigns
---@field committia? diffs.CommittiaConfig|false deprecated: use integrations.committia
---@field telescope? diffs.TelescopeConfig|false deprecated: use integrations.telescope
@ -161,6 +165,7 @@ local default_config = {
integrations = {
fugitive = false,
neogit = false,
neojj = false,
gitsigns = false,
committia = false,
telescope = false,
@ -239,6 +244,15 @@ function M.compute_filetypes(opts)
table.insert(fts, 'NeogitCommitView')
table.insert(fts, 'NeogitDiffView')
end
local njj = intg.neojj
if njj == nil then
njj = opts.neojj
end
if njj == true or type(njj) == 'table' then
table.insert(fts, 'NeojjStatus')
table.insert(fts, 'NeojjCommitView')
table.insert(fts, 'NeojjDiffView')
end
if type(opts.extra_filetypes) == 'table' then
for _, ft in ipairs(opts.extra_filetypes) do
table.insert(fts, ft)
@ -610,7 +624,7 @@ local function compute_highlight_groups(is_default)
end
end
local integration_keys = { 'fugitive', 'neogit', 'gitsigns', 'committia', 'telescope' }
local integration_keys = { 'fugitive', 'neogit', 'neojj', 'gitsigns', 'committia', 'telescope' }
local function migrate_integrations(opts)
if opts.integrations then
@ -674,6 +688,10 @@ local function init()
intg.neogit = {}
end
if intg.neojj == true then
intg.neojj = {}
end
if intg.gitsigns == true then
intg.gitsigns = {}
end
@ -1032,6 +1050,21 @@ function M.attach(bufnr)
})
end
local neojj_augroup = nil
if config.integrations.neojj and vim.bo[bufnr].filetype:match('^Neojj') then
vim.b[bufnr].neojj_disable_hunk_highlight = true
neojj_augroup = vim.api.nvim_create_augroup('diffs_neojj_' .. bufnr, { clear = true })
vim.api.nvim_create_autocmd('User', {
pattern = 'NeojjDiffLoaded',
group = neojj_augroup,
callback = function()
if vim.api.nvim_buf_is_valid(bufnr) and attached_buffers[bufnr] then
M.refresh(bufnr)
end
end,
})
end
dbg('attaching to buffer %d', bufnr)
ensure_cache(bufnr)
@ -1045,6 +1078,9 @@ function M.attach(bufnr)
if neogit_augroup then
pcall(vim.api.nvim_del_augroup_by_id, neogit_augroup)
end
if neojj_augroup then
pcall(vim.api.nvim_del_augroup_by_id, neojj_augroup)
end
end,
})
end
@ -1101,6 +1137,12 @@ function M.get_fugitive_config()
return config.integrations.fugitive
end
---@return diffs.NeojjConfig|false
function M.get_neojj_config()
init()
return config.integrations.neojj
end
---@return diffs.CommittiaConfig|false
function M.get_committia_config()
init()