Replace project_path with project_entry in workspace::{Item, ItemView}

crates/workspace/src/workspace.rs

@@ -27,7 +27,7 @@ pub use pane::*;
 pub use pane_group::*;
 use parking_lot::Mutex;
 use postage::{prelude::Stream, watch};
-use project::{fs, Fs, Project, ProjectPath, Worktree};
+use project::{fs, Fs, Project, ProjectEntry, ProjectPath, Worktree};
 pub use settings::Settings;
 use sidebar::{Side, Sidebar, SidebarItemId, ToggleSidebarItem, ToggleSidebarItemFocus};
 use status_bar::StatusBar;
@@ -140,8 +140,7 @@ pub trait Item: Entity + Sized {
         nav_history: Rc<NavHistory>,
         cx: &mut ViewContext<Self::View>,
     ) -> Self::View;
-
-    fn project_path(&self) -> Option<ProjectPath>;
+    fn project_entry(&self) -> Option<ProjectEntry>;
 }
 
 pub trait ItemView: View {
@@ -151,7 +150,7 @@ pub trait ItemView: View {
     fn navigate(&mut self, _: Box<dyn Any>, _: &mut ViewContext<Self>) {}
     fn item_handle(&self, cx: &AppContext) -> Self::ItemHandle;
     fn title(&self, cx: &AppContext) -> String;
-    fn project_path(&self, cx: &AppContext) -> Option<ProjectPath>;
+    fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry>;
     fn clone_on_split(&self, _: &mut ViewContext<Self>) -> Option<Self>
     where
         Self: Sized,
@@ -196,7 +195,7 @@ pub trait ItemHandle: Send + Sync {
     fn boxed_clone(&self) -> Box<dyn ItemHandle>;
     fn downgrade(&self) -> Box<dyn WeakItemHandle>;
     fn to_any(&self) -> AnyModelHandle;
-    fn project_path(&self, cx: &AppContext) -> Option<ProjectPath>;
+    fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry>;
 }
 
 pub trait WeakItemHandle {
@@ -207,7 +206,7 @@ pub trait WeakItemHandle {
 pub trait ItemViewHandle {
     fn item_handle(&self, cx: &AppContext) -> Box<dyn ItemHandle>;
     fn title(&self, cx: &AppContext) -> String;
-    fn project_path(&self, cx: &AppContext) -> Option<ProjectPath>;
+    fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry>;
     fn boxed_clone(&self) -> Box<dyn ItemViewHandle>;
     fn clone_on_split(&self, cx: &mut MutableAppContext) -> Option<Box<dyn ItemViewHandle>>;
     fn added_to_pane(&mut self, cx: &mut ViewContext<Pane>);
@@ -262,8 +261,8 @@ impl<T: Item> ItemHandle for ModelHandle<T> {
         self.clone().into()
     }
 
-    fn project_path(&self, cx: &AppContext) -> Option<ProjectPath> {
-        self.read(cx).project_path()
+    fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry> {
+        self.read(cx).project_entry()
     }
 }
 
@@ -294,8 +293,8 @@ impl ItemHandle for Box<dyn ItemHandle> {
         self.as_ref().to_any()
     }
 
-    fn project_path(&self, cx: &AppContext) -> Option<ProjectPath> {
-        self.as_ref().project_path(cx)
+    fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry> {
+        self.as_ref().project_entry(cx)
     }
 }
 
@@ -332,8 +331,8 @@ impl<T: ItemView> ItemViewHandle for ViewHandle<T> {
         self.read(cx).title(cx)
     }
 
-    fn project_path(&self, cx: &AppContext) -> Option<ProjectPath> {
-        self.read(cx).project_path(cx)
+    fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry> {
+        self.read(cx).project_entry(cx)
     }
 
     fn boxed_clone(&self) -> Box<dyn ItemViewHandle> {
@@ -776,6 +775,18 @@ impl Workspace {
         })
     }
 
+    pub fn load_entry(
+        &mut self,
+        path: ProjectEntry,
+        cx: &mut ViewContext<Self>,
+    ) -> Task<Result<Box<dyn ItemHandle>>> {
+        if let Some(path) = self.project.read(cx).path_for_entry(path, cx) {
+            self.load_path(path, cx)
+        } else {
+            Task::ready(Err(anyhow!("entry does not exist")))
+        }
+    }
+
     pub fn load_path(
         &mut self,
         path: ProjectPath,
@@ -805,10 +816,13 @@ impl Workspace {
     }
 
     fn item_for_path(&self, path: &ProjectPath, cx: &AppContext) -> Option<Box<dyn ItemHandle>> {
-        self.items
-            .iter()
-            .filter_map(|i| i.upgrade(cx))
-            .find(|i| i.project_path(cx).as_ref() == Some(path))
+        let project = self.project.read(cx);
+        self.items.iter().filter_map(|i| i.upgrade(cx)).find(|i| {
+            let item_path = i
+                .project_entry(cx)
+                .and_then(|entry| project.path_for_entry(entry, cx));
+            item_path.as_ref() == Some(path)
+        })
     }
 
     pub fn item_of_type<T: Item>(&self, cx: &AppContext) -> Option<ModelHandle<T>> {
@@ -822,7 +836,9 @@ impl Workspace {
     }
 
     fn active_project_path(&self, cx: &ViewContext<Self>) -> Option<ProjectPath> {
-        self.active_item(cx).and_then(|item| item.project_path(cx))
+        self.active_item(cx)
+            .and_then(|item| item.project_entry(cx))
+            .and_then(|entry| self.project.read(cx).path_for_entry(entry, cx))
     }
 
     pub fn save_active_item(&mut self, _: &Save, cx: &mut ViewContext<Self>) {