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

fix: cursor applying diff (#1387)

Browse Source
This commit is contained in:
yetone
2025-02-25 14:34:26 +08:00
committed by GitHub
parent e7ffb76499
commit 481a44f041
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lua/avante/sidebar.lua
View File

@@ -1261,12 +1261,21 @@ function Sidebar:apply(current_cursor)
local prev_start_a = 1 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)
vim.list_extend(new_lines, vim.list_slice(original_code_lines, prev_start_a, start_a - 1)) if count_a > 0 then
vim.list_extend(new_lines, vim.list_slice(original_code_lines, prev_start_a, start_a - 1))
else
vim.list_extend(new_lines, vim.list_slice(original_code_lines, prev_start_a, start_a))
end
prev_start_a = start_a + count_a prev_start_a = start_a + count_a
if count_a == 0 then prev_start_a = prev_start_a + 1 end
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)) if count_a > 0 then
vim.list_extend(new_lines, vim.list_slice(original_code_lines, start_a, start_a + count_a - 1))
end
table.insert(new_lines, "=======") table.insert(new_lines, "=======")
vim.list_extend(new_lines, vim.list_slice(resp_lines, start_b, start_b + count_b - 1)) if count_b > 0 then
vim.list_extend(new_lines, vim.list_slice(resp_lines, start_b, start_b + count_b - 1))
end
table.insert(new_lines, ">>>>>>> Snippet") table.insert(new_lines, ">>>>>>> Snippet")
end end