From 71a5964c187475564d5b43a66be9642f1b3c078e Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 24 Aug 2023 14:26:42 +0200
Subject: [PATCH] Rename `merge_transaction_into` to `merge_transactions`

---
 crates/ai/src/refactor.rs         |  2 +-
 crates/editor/src/multi_buffer.rs |  6 +++---
 crates/language/src/buffer.rs     |  8 ++------
 crates/text/src/text.rs           | 11 +++--------
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/crates/ai/src/refactor.rs b/crates/ai/src/refactor.rs
index 9b36d760b7..82bebeb336 100644
--- a/crates/ai/src/refactor.rs
+++ b/crates/ai/src/refactor.rs
@@ -193,7 +193,7 @@ impl RefactoringAssistant {
                                 if let Some(transaction) = buffer.end_transaction(cx) {
                                     if let Some(first_transaction) = first_transaction {
                                         // Group all assistant edits into the first transaction.
-                                        buffer.merge_transaction_into(
+                                        buffer.merge_transactions(
                                             transaction,
                                             first_transaction,
                                             cx,
diff --git a/crates/editor/src/multi_buffer.rs b/crates/editor/src/multi_buffer.rs
index 28b31ef097..88c66d5200 100644
--- a/crates/editor/src/multi_buffer.rs
+++ b/crates/editor/src/multi_buffer.rs
@@ -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,
                                     )
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 69668a97c6..e2154f498e 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -1294,12 +1294,8 @@ impl Buffer {
         self.text.forget_transaction(transaction_id);
     }
 
-    pub fn merge_transaction_into(
-        &mut self,
-        transaction: TransactionId,
-        destination: TransactionId,
-    ) {
-        self.text.merge_transaction_into(transaction, destination);
+    pub fn merge_transactions(&mut self, transaction: TransactionId, destination: TransactionId) {
+        self.text.merge_transactions(transaction, destination);
     }
 
     pub fn wait_for_edits(
diff --git a/crates/text/src/text.rs b/crates/text/src/text.rs
index e47e20da0d..8f15535ccf 100644
--- a/crates/text/src/text.rs
+++ b/crates/text/src/text.rs
@@ -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)> {