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

fix: trim escapes for write_to_file tool (#2455)

Browse Source
This commit is contained in:
yetone
2025-07-16 12:04:22 +08:00
committed by GitHub
parent 31be8718a6
commit 127a12a878
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lua/avante/llm_tools/create.lua
View File

@@ -61,7 +61,7 @@ function M.func(input, opts)
if Path:new(abs_path):exists() then return false, "File already exists: " .. abs_path end
local lines = vim.split(input.file_text, "\n")
if #lines == 1 and input.file_text:match("\\n") then
local text = Utils.trim_slashes(input.file_text)
local text = Utils.trim_escapes(input.file_text)
lines = vim.split(text, "\n")
end
local bufnr, err = Helpers.get_bufnr(abs_path)

4
lua/avante/llm_tools/write_to_file.lua
View File

@@ -66,6 +66,10 @@ function M.func(input, opts)
if not Helpers.has_permission_to_access(abs_path) then return false, "No permission to access path: " .. abs_path end
if input.content == nil then return false, "content not provided" end
if type(input.content) ~= "string" then input.content = vim.json.encode(input.content) end
if Utils.count_lines(input.content) == 1 then
Utils.debug("Trimming escapes from content")
input.content = Utils.trim_escapes(input.content)
end
local old_lines = Utils.read_file_from_buf_or_disk(abs_path)
local old_content = table.concat(old_lines or {}, "\n")
local str_replace = require("avante.llm_tools.str_replace")

6
lua/avante/utils/init.lua
View File

@@ -608,7 +608,7 @@ function M.trim_space(text)
return text:gsub("%s*", "")
end
function M.trim_slashes(text)
function M.trim_escapes(text)
if not text then return text end
local res = text
:gsub("//n", "/n")
@@ -677,14 +677,14 @@ function M.fuzzy_match(original_lines, target_lines)
start_line, end_line = M.try_find_match(
original_lines,
target_lines,
function(line_a, line_b) return line_a == M.trim_slashes(line_b) end
function(line_a, line_b) return line_a == M.trim_escapes(line_b) end
)
if start_line ~= nil and end_line ~= nil then return start_line, end_line end
---trim slashes and trim_space match
start_line, end_line = M.try_find_match(
original_lines,
target_lines,
function(line_a, line_b) return M.trim_space(line_a) == M.trim_space(M.trim_slashes(line_b)) end
function(line_a, line_b) return M.trim_space(line_a) == M.trim_space(M.trim_escapes(line_b)) end
)
return start_line, end_line
end