CarGDev/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix: finally diff in cursor planning mode again (#1338)" (#1339)

Browse Source
This commit is contained in:
yetone
2025-02-21 15:57:13 +08:00
committed by GitHub
parent 2550709cd4
commit 2ac53d75de
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lua/avante/sidebar.lua
View File

@@ -1251,20 +1251,24 @@ function Sidebar:apply(current_cursor)
ctxlen = vim.o.scrolloff, ctxlen = vim.o.scrolloff,
}) })
local offset = 0 local new_lines = {}
local prev_start_a = 1
for _, hunk in ipairs(patch) do for _, hunk in ipairs(patch) do
local start_a, count_a, start_b, count_b = unpack(hunk) local start_a, count_a, start_b, count_b = unpack(hunk)
local snippet_lines = vim.list_slice(resp_lines, start_b, start_b + count_b - 1) vim.list_extend(new_lines, vim.list_slice(original_code_lines, prev_start_a, start_a - 1))
local new_lines = {} prev_start_a = start_a + count_a
table.insert(new_lines, "<<<<<<< HEAD") table.insert(new_lines, "<<<<<<< HEAD")
vim.list_extend(new_lines, vim.list_slice(original_code_lines, start_a, start_a + count_a - 1)) vim.list_extend(new_lines, vim.list_slice(original_code_lines, start_a, start_a + count_a - 1))
table.insert(new_lines, "=======") table.insert(new_lines, "=======")
vim.list_extend(new_lines, snippet_lines) vim.list_extend(new_lines, vim.list_slice(resp_lines, start_b, start_b + count_b - 1))
table.insert(new_lines, ">>>>>>> Snippet") table.insert(new_lines, ">>>>>>> Snippet")
api.nvim_buf_set_lines(bufnr, offset + start_a - 1, offset + start_a + count_a, false, new_lines)
offset = offset + #snippet_lines + 3
end end
local remaining_lines = vim.list_slice(original_code_lines, prev_start_a, #original_code_lines)
new_lines = vim.list_extend(new_lines, remaining_lines)
api.nvim_buf_set_lines(bufnr, 0, -1, false, new_lines)
local process = function(winid) local process = function(winid)
api.nvim_set_current_win(winid) api.nvim_set_current_win(winid)
api.nvim_feedkeys(api.nvim_replace_termcodes("<Esc>", true, false, true), "n", true) api.nvim_feedkeys(api.nvim_replace_termcodes("<Esc>", true, false, true), "n", true)