Ensure rejecting a hunk dismisses the diff (#27919)
Release Notes: - N/A
This commit is contained in:
parent
ad42a8ad9b
commit
d340670fd4
3 changed files with 154 additions and 168 deletions
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue