text: Wrap BufferId into a newtype

crates/editor/src/items.rs

@@ -30,7 +30,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use text::Selection;
+use text::{BufferId, Selection};
 use theme::Theme;
 use ui::{h_flex, prelude::*, Label};
 use util::{paths::PathExt, paths::FILE_ROW_COLUMN_DELIMITER, ResultExt, TryFutureExt};
@@ -73,12 +73,14 @@ impl FollowableItem for Editor {
             .iter()
             .map(|excerpt| excerpt.buffer_id)
             .collect::<HashSet<_>>();
-        let buffers = project.update(cx, |project, cx| {
-            buffer_ids
-                .iter()
-                .map(|id| project.open_buffer_by_id(*id, cx))
-                .collect::<Vec<_>>()
-        });
+        let buffers = project
+            .update(cx, |project, cx| {
+                buffer_ids
+                    .iter()
+                    .map(|id| BufferId::new(*id).map(|id| project.open_buffer_by_id(id, cx)))
+                    .collect::<Result<Vec<_>>>()
+            })
+            .ok()?;
 
         let pane = pane.downgrade();
         Some(cx.spawn(|mut cx| async move {
@@ -109,10 +111,12 @@ impl FollowableItem for Editor {
                                 MultiBuffer::new(replica_id, project.read(cx).capability());
                             let mut excerpts = state.excerpts.into_iter().peekable();
                             while let Some(excerpt) = excerpts.peek() {
-                                let buffer_id = excerpt.buffer_id;
+                                let Ok(buffer_id) = BufferId::new(excerpt.buffer_id) else {
+                                    continue;
+                                };
                                 let buffer_excerpts = iter::from_fn(|| {
                                     let excerpt = excerpts.peek()?;
-                                    (excerpt.buffer_id == buffer_id)
+                                    (excerpt.buffer_id == u64::from(buffer_id))
                                         .then(|| excerpts.next().unwrap())
                                 });
                                 let buffer =
@@ -189,7 +193,7 @@ impl FollowableItem for Editor {
             .excerpts()
             .map(|(id, buffer, range)| proto::Excerpt {
                 id: id.to_proto(),
-                buffer_id: buffer.remote_id(),
+                buffer_id: buffer.remote_id().into(),
                 context_start: Some(serialize_text_anchor(&range.context.start)),
                 context_end: Some(serialize_text_anchor(&range.context.end)),
                 primary_start: range
@@ -336,9 +340,9 @@ async fn update_editor_from_message(
     let inserted_excerpt_buffers = project.update(cx, |project, cx| {
         inserted_excerpt_buffer_ids
             .into_iter()
-            .map(|id| project.open_buffer_by_id(id, cx))
-            .collect::<Vec<_>>()
-    })?;
+            .map(|id| BufferId::new(id).map(|id| project.open_buffer_by_id(id, cx)))
+            .collect::<Result<Vec<_>>>()
+    })??;
     let _inserted_excerpt_buffers = try_join_all(inserted_excerpt_buffers).await?;
 
     // Update the editor's excerpts.
@@ -362,7 +366,7 @@ async fn update_editor_from_message(
                 let Some(previous_excerpt_id) = insertion.previous_excerpt_id else {
                     continue;
                 };
-                let buffer_id = excerpt.buffer_id;
+                let buffer_id = BufferId::new(excerpt.buffer_id)?;
                 let Some(buffer) = project.read(cx).buffer_for_id(buffer_id) else {
                     continue;
                 };
@@ -370,7 +374,7 @@ async fn update_editor_from_message(
                 let adjacent_excerpts = iter::from_fn(|| {
                     let insertion = insertions.peek()?;
                     if insertion.previous_excerpt_id.is_none()
-                        && insertion.excerpt.as_ref()?.buffer_id == buffer_id
+                        && insertion.excerpt.as_ref()?.buffer_id == u64::from(buffer_id)
                     {
                         insertions.next()?.excerpt
                     } else {
@@ -395,8 +399,9 @@ async fn update_editor_from_message(
             }
 
             multibuffer.remove_excerpts(removed_excerpt_ids, cx);
-        });
-    })?;
+            Result::<(), anyhow::Error>::Ok(())
+        })
+    })??;
 
     // Deserialize the editor state.
     let (selections, pending_selection, scroll_top_anchor) = this.update(cx, |editor, cx| {
@@ -450,13 +455,13 @@ async fn update_editor_from_message(
 }
 
 fn serialize_excerpt(
-    buffer_id: u64,
+    buffer_id: BufferId,
     id: &ExcerptId,
     range: &ExcerptRange<language::Anchor>,
 ) -> Option<proto::Excerpt> {
     Some(proto::Excerpt {
         id: id.to_proto(),
-        buffer_id,
+        buffer_id: buffer_id.into(),
         context_start: Some(serialize_text_anchor(&range.context.start)),
         context_end: Some(serialize_text_anchor(&range.context.end)),
         primary_start: range