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

6
crates/editor/src/multi_buffer.rs
View file

@ -615,7 +615,7 @@ impl MultiBuffer {
}
}
pub fn merge_transaction_into(
pub fn merge_transactions(
&mut self,
transaction: TransactionId,
destination: TransactionId,
@ -623,7 +623,7 @@ impl MultiBuffer {
) {
if let Some(buffer) = self.as_singleton() {
buffer.update(cx, |buffer, _| {
buffer.merge_transaction_into(transaction, destination)
buffer.merge_transactions(transaction, destination)
});
} else {
if let Some(transaction) = self.history.remove_transaction(transaction) {
@ -634,7 +634,7 @@ impl MultiBuffer {
{
if let Some(state) = self.buffers.borrow().get(&buffer_id) {
state.buffer.update(cx, |buffer, _| {
buffer.merge_transaction_into(
buffer.merge_transactions(
buffer_transaction_id,
*destination_buffer_transaction_id,
)