zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge transactions into the original assistant transaction

Browse Source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Kyle Caverly <kyle@zed.dev>
This commit is contained in:
Antonio Scandurra 2023-08-23 18:20:42 +02:00
parent a69461dba2
commit 301a12923f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/ai/src/refactor.rs
View File

@ -85,7 +85,7 @@ impl RefactoringAssistant {
anyhow::Ok(())
});
let mut last_transaction = None;
let mut first_transaction = None;
while let Some(hunks) = hunks_rx.next().await {
editor.update(&mut cx, |editor, cx| {
let mut highlights = Vec::new();
@ -120,14 +120,15 @@ impl RefactoringAssistant {
cx,
);
if let Some(transaction) = buffer.end_transaction(cx) {
if let Some(last_transaction) = last_transaction {
if let Some(first_transaction) = first_transaction {
buffer.merge_transaction_into(
last_transaction,
transaction,
first_transaction,
cx,
);
} else {
first_transaction = Some(transaction);
}
last_transaction = Some(transaction);
buffer.finalize_last_transaction(cx);
}
});