History

Merge transactions into the original assistant transaction

Antonio Scandurra committed 3 years ago

Commit 301a1291 parent a69461d1 file · +5 −4Browse files

Unified · Split

crates/ai/src/refactor.rs+5−4
@@ -85,7 +85,7 @@ impl RefactoringAssistant { · 84 unmodified lines
8585 anyhow::Ok(())
8686 });
8787
88− let mut last_transaction = None;
88+ let mut first_transaction = None;
8989 while let Some(hunks) = hunks_rx.next().await {
9090 editor.update(&mut cx, |editor, cx| {
9191 let mut highlights = Vec::new();
@@ -120,14 +120,15 @@ impl RefactoringAssistant { · 28 unmodified lines
120120 cx,
121121 );
122122 if let Some(transaction) = buffer.end_transaction(cx) {
123− if let Some(last_transaction) = last_transaction {
123+ if let Some(first_transaction) = first_transaction {
124124 buffer.merge_transaction_into(
125− last_transaction,
126125 transaction,
126+ first_transaction,
127127 cx,
128128 );
129+ } else {
130+ first_transaction = Some(transaction);
129131 }
130− last_transaction = Some(transaction);
131132 buffer.finalize_last_transaction(cx);
132133 }
133134 });

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t