fix: diff insert (#893)

2024-11-24 05:10:09 +08:00
parent 67e946ef13
commit 5e6d3368f7
1 changed files with 4 additions and 0 deletions
--- a/lua/avante/sidebar.lua
+++ b/lua/avante/sidebar.lua
@@ -462,6 +462,10 @@ local function insert_conflict_contents(bufnr, snippets)

  for _, snippet in ipairs(snippets) do
    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 start_line_indentation = ""