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

fix: diff insert (#893)

Browse Source
This commit is contained in:
yetone 2024-11-24 05:10:09 +08:00 committed by GitHub
parent 67e946ef13
commit 5e6d3368f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/avante/sidebar.lua
View File

@ -462,6 +462,10 @@ local function insert_conflict_contents(bufnr, snippets)
for _, snippet in ipairs(snippets) do for _, snippet in ipairs(snippets) do
local start_line, end_line = unpack(snippet.range) local start_line, end_line = unpack(snippet.range)
if start_line > end_line then
start_line = start_line + 1
end_line = end_line + 1
end
local need_prepend_indentation = false local need_prepend_indentation = false
local start_line_indentation = "" local start_line_indentation = ""