Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

find-replace tool: Return diff in output (#27868)

Browse source 
This should help the model maintain an accurate picture of the file as
it makes changes

Release Notes:

- N/A
This commit is contained in:
Agus Zubiaga 2025-04-01 16:57:32 -03:00 • committed by GitHub
parent 5880271b11
commit 92059803fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 38 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

60
crates/assistant_tools/src/find_replace_file_tool.rs
View file

@ -189,31 +189,22 @@ impl Tool for FindReplaceFileTool {
let result = cx
.background_spawn(async move {
// Try to match exactly
replace_exact(&input.find, &input.replace, &snapshot)
let diff = replace_exact(&input.find, &input.replace, &snapshot)
.await
// If that fails, try being flexible about indentation
.or_else(|| replace_with_flexible_indent(&input.find, &input.replace, &snapshot))
.or_else(|| replace_with_flexible_indent(&input.find, &input.replace, &snapshot))?;
if diff.edits.is_empty() {
return None;
}
let old_text = snapshot.text();
Some((old_text, diff))
})
.await;
if let Some(diff) = result {
let edit_ids = buffer.update(cx, |buffer, cx| {
buffer.finalize_last_transaction();
buffer.apply_diff(diff, false, cx);
let transaction = buffer.finalize_last_transaction();
transaction.map_or(Vec::new(), |transaction| transaction.edit_ids.clone())
})?;
action_log.update(cx, |log, cx| {
log.buffer_edited(buffer.clone(), edit_ids, cx)
})?;
project.update(cx, |project, cx| {
project.save_buffer(buffer, cx)
})?.await?;
Ok(format!("Edited {}", input.path.display()))
} else {
let Some((old_text, diff)) = result else {
let err = buffer.read_with(cx, |buffer, _cx| {
let file_exists = buffer
.file()
@ -231,8 +222,33 @@ impl Tool for FindReplaceFileTool {
}
})?;
Err(err)
}
return Err(err)
};
let (edit_ids, snapshot) = buffer.update(cx, |buffer, cx| {
buffer.finalize_last_transaction();
buffer.apply_diff(diff, false, cx);
let transaction = buffer.finalize_last_transaction();
let edit_ids = transaction.map_or(Vec::new(), |transaction| transaction.edit_ids.clone());
(edit_ids, buffer.snapshot())
})?;
action_log.update(cx, |log, cx| {
log.buffer_edited(buffer.clone(), edit_ids, cx)
})?;
project.update(cx, |project, cx| {
project.save_buffer(buffer, cx)
})?.await?;
let diff_str = cx.background_spawn(async move {
let new_text = snapshot.text();
language::unified_diff(&old_text, &new_text)
}).await;
Ok(format!("Edited {}:\n\n```diff\n{}\n```", input.path.display(), diff_str))
})
}
}