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

fix: finally diff in cursor planning mode (#1337)

Browse Source
This commit is contained in:
yetone
2025-02-21 14:42:22 +08:00
committed by GitHub
parent 25a6bd6e59
commit 5a2e8760f4
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lua/avante/sidebar.lua
View File

@@ -1238,16 +1238,14 @@ function Sidebar:apply(current_cursor)
resp_content = resp_content:gsub("<updated%-code>\n*", ""):gsub("</updated%-code>\n*", "") resp_content = resp_content:gsub("<updated%-code>\n*", ""):gsub("</updated%-code>\n*", "")
resp_content = resp_content:gsub(".*```%w+\n", ""):gsub("\n```\n.*", ""):gsub("\n```", "") resp_content = resp_content:gsub(".*```%w+\n", ""):gsub("\n```\n.*", ""):gsub("\n```$", "")
local resp_lines = vim.split(resp_content, "\n") local resp_lines = vim.split(resp_content, "\n")
local original_lines = vim.list_slice(original_code_lines, 1, #resp_lines)
local resp_lines_content = table.concat(resp_lines, "\n") local resp_lines_content = table.concat(resp_lines, "\n")
local original_lines_content = table.concat(original_lines, "\n")
if resp_lines_content == original_lines_content then return end if resp_lines_content == original_code then return end
---@diagnostic disable-next-line: assign-type-mismatch, missing-fields ---@diagnostic disable-next-line: assign-type-mismatch, missing-fields
local patch = vim.diff(original_lines_content, resp_lines_content, { ---@type integer[][] local patch = vim.diff(original_code, resp_lines_content, { ---@type integer[][]
algorithm = "histogram", algorithm = "histogram",
result_type = "indices", result_type = "indices",
ctxlen = vim.o.scrolloff, ctxlen = vim.o.scrolloff,
@@ -1257,10 +1255,10 @@ 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_lines, prev_start_a, start_a - 1)) vim.list_extend(new_lines, vim.list_slice(original_code_lines, prev_start_a, start_a - 1))
prev_start_a = start_a + count_a 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_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, vim.list_slice(resp_lines, start_b, start_b + count_b - 1)) 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")