Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit 9c9a09cccb.
This commit is contained in:
Nathan Sobo 2022-01-21 11:07:10 -07:00
parent 1d72e8face
commit a73671e57c
7 changed files with 67 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/workspace/src/pane.rs
View file

@ -10,7 +10,7 @@ use gpui::{
Entity, MutableAppContext, Quad, RenderContext, Task, View, ViewContext, ViewHandle,
};
use postage::watch;
use project::ProjectEntry;
use project::ProjectPath;
use std::{any::Any, cell::RefCell, cmp, mem, rc::Rc};
use util::ResultExt;
@ -89,7 +89,7 @@ pub struct NavHistory {
mode: NavigationMode,
backward_stack: VecDeque<NavigationEntry>,
forward_stack: VecDeque<NavigationEntry>,
project_entries_by_item: HashMap<usize, ProjectEntry>,
paths_by_item: HashMap<usize, ProjectPath>,
}
#[derive(Copy, Clone)]
@ -150,10 +150,10 @@ impl Pane {
) -> Task<()> {
let to_load = pane.update(cx, |pane, cx| {
// Retrieve the weak item handle from the history.
let nav_entry = pane.nav_history.borrow_mut().pop(mode)?;
let entry = pane.nav_history.borrow_mut().pop(mode)?;
// If the item is still present in this pane, then activate it.
if let Some(index) = nav_entry
if let Some(index) = entry
.item_view
.upgrade(cx)
.and_then(|v| pane.index_for_item_view(v.as_ref()))
@ -168,7 +168,7 @@ impl Pane {
pane.active_item_index = index;
pane.focus_active_item(cx);
if let Some(data) = nav_entry.data {
if let Some(data) = entry.data {
pane.active_item()?.navigate(data, cx);
}
cx.notify();
@ -179,17 +179,17 @@ impl Pane {
else {
pane.nav_history
.borrow_mut()
.project_entries_by_item
.get(&nav_entry.item_view.id())
.paths_by_item
.get(&entry.item_view.id())
.cloned()
.map(|project_entry| (project_entry, nav_entry))
.map(|project_path| (project_path, entry))
}
});
if let Some((project_entry, nav_entry)) = to_load {
if let Some((project_path, entry)) = to_load {
// If the item was no longer present, then load it again from its previous path.
let pane = pane.downgrade();
let task = workspace.load_entry(project_entry, cx);
let task = workspace.load_path(project_path, cx);
cx.spawn(|workspace, mut cx| async move {
let item = task.await;
if let Some(pane) = cx.read(|cx| pane.upgrade(cx)) {
@ -201,7 +201,7 @@ impl Pane {
p.nav_history.borrow_mut().set_mode(NavigationMode::Normal)
});
if let Some(data) = nav_entry.data {
if let Some(data) = entry.data {
item_view.navigate(data, cx);
}
});
@ -328,12 +328,10 @@ impl Pane {
}
let mut nav_history = self.nav_history.borrow_mut();
if let Some(entry) = item_view.project_entry(cx) {
nav_history
.project_entries_by_item
.insert(item_view.id(), entry);
if let Some(path) = item_view.project_path(cx) {
nav_history.paths_by_item.insert(item_view.id(), path);
} else {
nav_history.project_entries_by_item.remove(&item_view.id());
nav_history.paths_by_item.remove(&item_view.id());
}
item_ix += 1;

50
crates/workspace/src/workspace.rs
View file

@ -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, ProjectEntry, ProjectPath, Worktree};
use project::{fs, Fs, Project, ProjectPath, Worktree};
pub use settings::Settings;
use sidebar::{Side, Sidebar, SidebarItemId, ToggleSidebarItem, ToggleSidebarItemFocus};
use status_bar::StatusBar;
@ -145,7 +145,8 @@ pub trait Item: Entity + Sized {
nav_history: ItemNavHistory,
cx: &mut ViewContext<Self::View>,
) -> Self::View;
fn project_entry(&self) -> Option<ProjectEntry>;
fn project_path(&self) -> Option<ProjectPath>;
}
pub trait ItemView: View {
@ -155,7 +156,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_entry(&self, cx: &AppContext) -> Option<ProjectEntry>;
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath>;
fn clone_on_split(&self, _: &mut ViewContext<Self>) -> Option<Self>
where
Self: Sized,
@ -212,7 +213,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_entry(&self, cx: &AppContext) -> Option<ProjectEntry>;
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath>;
}
pub trait WeakItemHandle {
@ -223,7 +224,7 @@ pub trait WeakItemHandle {
pub trait ItemViewHandle: 'static {
fn item_handle(&self, cx: &AppContext) -> Box<dyn ItemHandle>;
fn title(&self, cx: &AppContext) -> String;
fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry>;
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath>;
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>);
@ -280,8 +281,8 @@ impl<T: Item> ItemHandle for ModelHandle<T> {
self.clone().into()
}
fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry> {
self.read(cx).project_entry()
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath> {
self.read(cx).project_path()
}
}
@ -312,8 +313,8 @@ impl ItemHandle for Box<dyn ItemHandle> {
self.as_ref().to_any()
}
fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry> {
self.as_ref().project_entry(cx)
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath> {
self.as_ref().project_path(cx)
}
}
@ -361,8 +362,8 @@ impl<T: ItemView> ItemViewHandle for ViewHandle<T> {
self.read(cx).title(cx)
}
fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry> {
self.read(cx).project_entry(cx)
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath> {
self.read(cx).project_path(cx)
}
fn boxed_clone(&self) -> Box<dyn ItemViewHandle> {
@ -778,18 +779,6 @@ 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,
@ -812,13 +801,10 @@ impl Workspace {
}
fn item_for_path(&self, path: &ProjectPath, cx: &AppContext) -> Option<Box<dyn ItemHandle>> {
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)
})
self.items
.iter()
.filter_map(|i| i.upgrade(cx))
.find(|i| i.project_path(cx).as_ref() == Some(path))
}
pub fn item_of_type<T: Item>(&self, cx: &AppContext) -> Option<ModelHandle<T>> {
@ -832,9 +818,7 @@ impl Workspace {
}
fn active_project_path(&self, cx: &ViewContext<Self>) -> Option<ProjectPath> {
self.active_item(cx)
.and_then(|item| item.project_entry(cx))
.and_then(|entry| self.project.read(cx).path_for_entry(entry, cx))
self.active_item(cx).and_then(|item| item.project_path(cx))
}
pub fn save_active_item(&mut self, cx: &mut ViewContext<Self>) -> Task<Result<()>> {