From 1deff43639f012b2400d6f2a8cc3f16aa057da26 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 28 Feb 2023 08:27:15 -0800
Subject: [PATCH] Avoid calling edits_since in apply_diff

---
 crates/language/src/buffer.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 5402709124..5d7e4325d1 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -1199,7 +1199,10 @@ impl Buffer {
 
     pub fn apply_diff(&mut self, diff: Diff, cx: &mut ModelContext<Self>) -> Option<TransactionId> {
         if self.version == diff.base_version {
-            self.apply_non_conflicting_portion_of_diff(diff, cx)
+            self.start_transaction();
+            self.text.set_line_ending(diff.line_ending);
+            self.edit(diff.edits, None, cx);
+            self.end_transaction(cx)
         } else {
             return None;
         }