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

fix: compatible with backquoted returns (#728)

Browse Source
This commit is contained in:
yetone 2024-10-16 16:23:02 +08:00 committed by GitHub
parent 7c83558b37
commit 595ea56fc1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lua/avante/sidebar.lua
View File

@ -175,12 +175,18 @@ local function transform_result_content(original_content, result_content, code_l
local line_content = result_lines[i] local line_content = result_lines[i]
if line_content == "<SEARCH>" then if line_content == "<SEARCH>" then
is_searching = true is_searching = true
local next_line = result_lines[i + 1]
if next_line and next_line:match("^%s*```%w+$") then i = i + 1 end
search_start = i + 1 search_start = i + 1
last_search_tag_start_line = i last_search_tag_start_line = i
elseif line_content == "</SEARCH>" then elseif line_content == "</SEARCH>" then
is_searching = false is_searching = false
local search_end = i local search_end = i
local prev_line = result_lines[i - 1]
if prev_line and prev_line:match("^%s*```$") then search_end = i - 1 end
local start_line = 0 local start_line = 0
local end_line = 0 local end_line = 0
for j = 1, #original_lines - (search_end - search_start) + 1 do for j = 1, #original_lines - (search_end - search_start) + 1 do
@ -217,11 +223,14 @@ local function transform_result_content(original_content, result_content, code_l
goto continue goto continue
elseif line_content == "<REPLACE>" then elseif line_content == "<REPLACE>" then
is_replacing = true is_replacing = true
local next_line = result_lines[i + 1]
if next_line and next_line:match("^%s*```%w+$") then i = i + 1 end
last_replace_tag_start_line = i last_replace_tag_start_line = i
goto continue goto continue
elseif line_content == "</REPLACE>" then elseif line_content == "</REPLACE>" then
is_replacing = false is_replacing = false
table.insert(transformed_lines, "```") local prev_line = result_lines[i - 1]
if not (prev_line and prev_line:match("^%s*```$")) then table.insert(transformed_lines, "```") end
goto continue goto continue
end end
table.insert(transformed_lines, line_content) table.insert(transformed_lines, line_content)