From 4ee404a0af9e0146d21bca0f8c9851d506a21947 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 8 Dec 2021 19:30:52 -0700
Subject: [PATCH] Take a cx in MultiBuffer::start_transaction

---
 crates/editor/src/editor.rs         | 8 +++-----
 crates/language/src/multi_buffer.rs | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index a88d962ba93a14ac5d5b573fc519cfa90cd9cc7c..ae1143d0fa342ca39440b7e36ecafc44f4618192 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -3211,18 +3211,16 @@ impl Editor {
 
     fn start_transaction(&mut self, cx: &mut ViewContext<Self>) {
         self.end_selection(cx);
-        self.buffer.update(cx, |buffer, _| {
+        self.buffer.update(cx, |buffer, cx| {
             buffer
-                .start_transaction(Some(self.selection_set_id))
+                .start_transaction([self.selection_set_id], cx)
                 .unwrap()
         });
     }
 
     fn end_transaction(&self, cx: &mut ViewContext<Self>) {
         self.buffer.update(cx, |buffer, cx| {
-            buffer
-                .end_transaction(Some(self.selection_set_id), cx)
-                .unwrap()
+            buffer.end_transaction([self.selection_set_id], cx).unwrap()
         });
     }
 
diff --git a/crates/language/src/multi_buffer.rs b/crates/language/src/multi_buffer.rs
index 12834a53d3b9c614dbb5c65e5517904d5abaae89..300deb4487dac1f82c4dbd7267150423b7456519 100644
--- a/crates/language/src/multi_buffer.rs
+++ b/crates/language/src/multi_buffer.rs
@@ -169,6 +169,7 @@ impl MultiBuffer {
     pub fn start_transaction(
         &mut self,
         selection_set_ids: impl IntoIterator<Item = SelectionSetId>,
+        cx: &mut ModelContext<Self>,
     ) -> Result<()> {
         todo!()
     }