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

Rename merge_transaction_into to merge_transactions

Browse source
This commit is contained in:
Antonio Scandurra 2023-08-24 14:26:42 +02:00
parent 9674b03855
commit 71a5964c18
4 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/text/src/text.rs
View file

@ -310,7 +310,7 @@ impl History {
Some(&mut entry.transaction)
}
fn merge_transaction_into(&mut self, transaction: TransactionId, destination: TransactionId) {
fn merge_transactions(&mut self, transaction: TransactionId, destination: TransactionId) {
if let Some(transaction) = self.forget(transaction) {
if let Some(destination) = self.transaction_mut(destination) {
destination.edit_ids.extend(transaction.edit_ids);
@ -1225,13 +1225,8 @@ impl Buffer {
self.history.forget(transaction_id);
}
pub fn merge_transaction_into(
&mut self,
transaction: TransactionId,
destination: TransactionId,
) {
self.history
.merge_transaction_into(transaction, destination);
pub fn merge_transactions(&mut self, transaction: TransactionId, destination: TransactionId) {
self.history.merge_transactions(transaction, destination);
}
pub fn redo(&mut self) -> Option<(TransactionId, Operation)> {