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

fix: incorrect indentation (#1222)

Browse Source
This commit is contained in:
yetone 2025-02-09 00:21:32 +08:00 committed by GitHub
parent faa6728d4b
commit e70b0fa243
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lua/avante/sidebar.lua
View File

@ -597,10 +597,6 @@ local function insert_conflict_contents(bufnr, snippets)
end_line = end_line + 1 end_line = end_line + 1
end end
local need_prepend_indentation = false
local start_line_indentation = ""
local original_start_line_indentation = Utils.get_indentation(lines[start_line] or "")
local result = {} local result = {}
table.insert(result, "<<<<<<< HEAD") table.insert(result, "<<<<<<< HEAD")
for i = start_line, end_line do for i = start_line, end_line do
@ -610,19 +606,7 @@ local function insert_conflict_contents(bufnr, snippets)
local snippet_lines = vim.split(snippet.content, "\n") local snippet_lines = vim.split(snippet.content, "\n")
for idx, line in ipairs(snippet_lines) do vim.list_extend(result, snippet_lines)
if idx == 1 then
start_line_indentation = Utils.get_indentation(line)
need_prepend_indentation = start_line_indentation ~= original_start_line_indentation
end
if need_prepend_indentation then
if line:sub(1, #start_line_indentation) == start_line_indentation then
line = line:sub(#start_line_indentation + 1)
end
line = original_start_line_indentation .. line
end
table.insert(result, line)
end
table.insert(result, ">>>>>>> Snippet") table.insert(result, ">>>>>>> Snippet")