mirror of
https://github.com/zoriya/jj.nvim.git
synced 2026-08-05 10:46:08 +00:00
Nicolas GBandGitHub
335663c3ee
- Refactor diff into modular architecture (native, diffview, codediff) - Add the possibility for users to define their own diff backend - Support external diff tools like diffview.nvim codediff.nvim - Enable visual mode selection to diff two changes in log buffer - Add summary tooltip integration with terminal - Update documentation with new diff workflows
56 lines
1.5 KiB
Lua
56 lines
1.5 KiB
Lua
local M = {}
|
|
local cmd = require("jj.cmd")
|
|
local picker = require("jj.picker")
|
|
local editor = require("jj.ui.editor")
|
|
local terminal = require("jj.ui.terminal")
|
|
local diff = require("jj.diff")
|
|
|
|
--- Jujutsu plugin configuration
|
|
--- @class jj.Config
|
|
--- @field cmd? jj.cmd.opts Options for command module
|
|
--- @field picker? jj.picker.config Options for picker module
|
|
--- @field terminal? jj.ui.terminal.opts Options for the terminal
|
|
--- @field highlights? jj.highlights Options for the highlights
|
|
--- @field diff? jj.diff.config Options for the diff module
|
|
|
|
--- @class jj.highlights
|
|
--- @field editor? jj.ui.editor.highlights Highlight configuration for describe buffer
|
|
--- @field log? jj.cmd.log.highlights Highlight configuration for the log buffer
|
|
|
|
---@type jj.Config
|
|
M.config = {
|
|
picker = {
|
|
snacks = {},
|
|
},
|
|
highlights = {
|
|
editor = {
|
|
renamed = { fg = "#d29922", ctermfg = "Yellow" },
|
|
},
|
|
log = {
|
|
selected = { bg = "#3d2c52", ctermbg = "DarkMagenta" },
|
|
targeted = { fg = "#5a9e6f", ctermfg = "Green" },
|
|
},
|
|
},
|
|
diff = {
|
|
backend = "native",
|
|
backends = {},
|
|
},
|
|
}
|
|
|
|
--- Setup the plugin
|
|
--- @param opts jj.Config: Options to configure the plugin
|
|
function M.setup(opts)
|
|
M.config = vim.tbl_deep_extend("force", M.config, opts or {})
|
|
|
|
-- Setup for sub-modules
|
|
picker.setup(opts and opts.picker or {})
|
|
editor.setup({ highlights = M.config.highlights.editor })
|
|
cmd.setup(opts and opts.cmd or {})
|
|
terminal.setup(opts and opts.terminal or {})
|
|
diff.setup(M.config.diff)
|
|
|
|
cmd.register_command()
|
|
end
|
|
|
|
return M
|