From 77e322cb750ecefd5877f63034c7a33369be1452 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Thu, 5 Jan 2023 13:50:25 -0700
Subject: [PATCH] Wait for incomplete buffers when handling incoming buffer
 file updates

---
 crates/project/src/project.rs | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index dc41e68b4f..ff18fa0cbc 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -5074,20 +5074,29 @@ impl Project {
         _: Arc<Client>,
         mut cx: AsyncAppContext,
     ) -> Result<()> {
+        let buffer_id = envelope.payload.buffer_id;
+        let is_incomplete = this.read_with(&cx, |this, _| {
+            this.incomplete_remote_buffers.contains_key(&buffer_id)
+        });
+
+        let buffer = if is_incomplete {
+            Some(
+                this.update(&mut cx, |this, cx| {
+                    this.wait_for_remote_buffer(buffer_id, cx)
+                })
+                .await?,
+            )
+        } else {
+            None
+        };
+
         this.update(&mut cx, |this, cx| {
             let payload = envelope.payload.clone();
-            let buffer_id = payload.buffer_id;
-            if let Some(buffer) = this
-                .opened_buffers
-                .get_mut(&buffer_id)
-                .and_then(|b| b.upgrade(cx))
-                .or_else(|| {
-                    this.incomplete_remote_buffers
-                        .get(&buffer_id)
-                        .cloned()
-                        .flatten()
-                })
-            {
+            if let Some(buffer) = buffer.or_else(|| {
+                this.opened_buffers
+                    .get(&buffer_id)
+                    .and_then(|b| b.upgrade(cx))
+            }) {
                 let file = payload.file.ok_or_else(|| anyhow!("invalid file"))?;
                 let worktree = this
                     .worktree_for_id(WorktreeId::from_proto(file.worktree_id), cx)