Ensure rejecting a hunk dismisses the diff (#27919)

Release Notes:

- N/A
This commit is contained in:
Antonio Scandurra 2025-04-02 16:06:36 +02:00 committed by GitHub
parent ad42a8ad9b
commit d340670fd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 154 additions and 168 deletions

View file

@ -339,6 +339,8 @@ impl EditToolRequest {
}
DiffResult::Diff(diff) => {
cx.update(|cx| {
self.action_log
.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
buffer.update(cx, |buffer, cx| {
buffer.finalize_last_transaction();
buffer.apply_diff(diff, cx);

View file

@ -226,6 +226,9 @@ impl Tool for FindReplaceFileTool {
};
let snapshot = cx.update(|cx| {
action_log.update(cx, |log, cx| {
log.buffer_read(buffer.clone(), cx)
});
let snapshot = buffer.update(cx, |buffer, cx| {
buffer.finalize_last_transaction();
buffer.apply_diff(diff, cx);