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

feat(test: git diff backend

Browse source
This commit is contained in:
Barrett Ruth 2025-09-19 12:11:50 -04:00
parent 289e6efe62
commit d193fabfb9
3 changed files with 110 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lua/cp/diff.lua
View file

@ -48,42 +48,16 @@ local git_backend = {
vim.fn.delete(tmp_actual)
if result.code == 0 then
-- No differences, return actual content as-is
return {
content = vim.split(actual, '\n', { plain = true, trimempty = true }),
highlights = {}
}
else
-- Parse git diff output
local lines = vim.split(result.stdout or '', '\n', { plain = true })
local content_lines = {}
local highlights = {}
-- Skip git diff header lines (start with @@, +++, ---, etc.)
local content_started = false
for _, line in ipairs(lines) do
if content_started or (not line:match('^@@') and not line:match('^%+%+%+') and not line:match('^%-%-%-') and not line:match('^index')) then
content_started = true
if line:match('^[^%-+]') or line:match('^%+') then
-- Skip lines starting with - (removed lines) for the actual pane
-- Only show lines that are unchanged or added
if not line:match('^%-') then
local clean_line = line:gsub('^%+', '') -- Remove + prefix
table.insert(content_lines, clean_line)
-- Parse highlights will be handled in highlight.lua
table.insert(highlights, {
line = #content_lines,
content = clean_line
})
end
end
end
end
local highlight_module = require('cp.highlight')
return {
content = content_lines,
highlights = highlights
content = {},
highlights = {},
raw_diff = result.stdout or ''
}
end
end
@ -122,18 +96,12 @@ end
function M.get_best_backend(preferred_backend)
if preferred_backend and backends[preferred_backend] then
if preferred_backend == 'git' and not M.is_git_available() then
-- Fall back to vim if git is not available
return backends.vim
end
return backends[preferred_backend]
end
-- Default to git if available, otherwise vim
if M.is_git_available() then
return backends.git
else
return backends.vim
end
return backends.vim
end
---Render diff using specified backend

48
lua/cp/init.lua
View file

@ -225,6 +225,9 @@ local function toggle_test_panel(is_debug)
actual_buf = actual_buf,
}
local highlight = require('cp.highlight')
local diff_namespace = highlight.create_namespace()
local function render_test_tabs()
local test_render = require('cp.test_render')
test_render.setup_highlights()
@ -250,6 +253,15 @@ local function toggle_test_panel(is_debug)
local expected_lines = vim.split(expected_text, '\n', { plain = true, trimempty = true })
update_buffer_content(test_buffers.expected_buf, expected_lines)
local diff_backend = require('cp.diff')
local backend = diff_backend.get_best_backend(config.test_panel.diff_mode)
if backend.name == 'vim' and current_test.status == 'fail' then
vim.api.nvim_set_option_value('diff', true, { win = test_windows.expected_win })
else
vim.api.nvim_set_option_value('diff', false, { win = test_windows.expected_win })
end
end
local function update_actual_pane()
@ -270,24 +282,38 @@ local function toggle_test_panel(is_debug)
actual_lines = { '(not run yet)' }
end
update_buffer_content(test_buffers.actual_buf, actual_lines)
local test_render = require('cp.test_render')
local status_bar_text = test_render.render_status_bar(current_test)
if status_bar_text ~= '' then
vim.api.nvim_set_option_value('winbar', status_bar_text, { win = test_windows.actual_win })
end
vim.api.nvim_set_option_value('diff', enable_diff, { win = test_windows.expected_win })
vim.api.nvim_set_option_value('diff', enable_diff, { win = test_windows.actual_win })
if enable_diff then
vim.api.nvim_win_call(test_windows.expected_win, function()
vim.cmd.diffthis()
end)
vim.api.nvim_win_call(test_windows.actual_win, function()
vim.cmd.diffthis()
end)
local diff_backend = require('cp.diff')
local backend = diff_backend.get_best_backend(config.test_panel.diff_mode)
if backend.name == 'git' then
local diff_result = backend.render(current_test.expected, current_test.actual)
if diff_result.raw_diff and diff_result.raw_diff ~= '' then
highlight.parse_and_apply_diff(test_buffers.actual_buf, diff_result.raw_diff, diff_namespace)
else
update_buffer_content(test_buffers.actual_buf, actual_lines)
end
else
update_buffer_content(test_buffers.actual_buf, actual_lines)
vim.api.nvim_set_option_value('diff', true, { win = test_windows.expected_win })
vim.api.nvim_set_option_value('diff', true, { win = test_windows.actual_win })
vim.api.nvim_win_call(test_windows.expected_win, function()
vim.cmd.diffthis()
end)
vim.api.nvim_win_call(test_windows.actual_win, function()
vim.cmd.diffthis()
end)
end
else
update_buffer_content(test_buffers.actual_buf, actual_lines)
vim.api.nvim_set_option_value('diff', false, { win = test_windows.expected_win })
vim.api.nvim_set_option_value('diff', false, { win = test_windows.actual_win })
end
end