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

16
lua/diffs/parser.lua
View file

@ -129,6 +129,18 @@ local function get_repo_root(bufnr)
return vim.fn.fnamemodify(neogit_git_dir, ':h')
end
if vim.bo[bufnr].filetype:match('^Neojj') then
local jj_ok, jj_mod = pcall(require, 'neojj.lib.jj')
if jj_ok then
local rok, repo = pcall(function()
return jj_mod.repo
end)
if rok and repo and repo.worktree_root then
return repo.worktree_root
end
end
end
local cwd = vim.fn.getcwd()
local git = require('diffs.git')
return git.get_repo_root(cwd .. '/.')
@ -244,6 +256,10 @@ function M.parse_buffer(bufnr)
or (not logical:match('^deleted file mode') and logical:match('^deleted%s+(.+)$'))
or logical:match('^renamed%s+(.+)$')
or logical:match('^copied%s+(.+)$')
or logical:match('^added%s+(.+)$')
or logical:match('^updated%s+(.+)$')
or logical:match('^changed%s+(.+)$')
or logical:match('^unmerged%s+(.+)$')
local bare_file = not hunk_start and logical:match('^([^%s]+%.[^%s]+)$')
local filename = logical:match('^[MADRCU%?!]%s+(.+)$')
or diff_git_file