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

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

Browse source
This commit is contained in:
Antonio Scandurra 2022-01-19 15:56:04 +01:00
parent 18f1040c85
commit 9c9a09cccb
7 changed files with 122 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/diagnostics/src/diagnostics.rs
View file

@ -528,7 +528,7 @@ impl workspace::Item for ProjectDiagnostics {
ProjectDiagnosticsEditor::new(handle, workspace.weak_handle(), workspace.settings(), cx) ProjectDiagnosticsEditor::new(handle, workspace.weak_handle(), workspace.settings(), cx)
} }
fn project_path(&self) -> Option<project::ProjectPath> { fn project_entry(&self) -> Option<project::ProjectEntry> {
None None
} }
} }
@ -544,7 +544,7 @@ impl workspace::ItemView for ProjectDiagnosticsEditor {
"Project Diagnostics".to_string() "Project Diagnostics".to_string()
} }
fn project_path(&self, _: &AppContext) -> Option<project::ProjectPath> { fn project_entry(&self, _: &AppContext) -> Option<project::ProjectEntry> {
None None
} }

18
crates/editor/src/items.rs
View file

@ -6,7 +6,7 @@ use gpui::{
}; };
use language::{Bias, Buffer, Diagnostic, File as _}; use language::{Bias, Buffer, Diagnostic, File as _};
use postage::watch; use postage::watch;
use project::{File, ProjectPath, Worktree}; use project::{File, ProjectEntry, ProjectPath, Worktree};
use std::fmt::Write; use std::fmt::Write;
use std::path::Path; use std::path::Path;
use std::rc::Rc; use std::rc::Rc;
@ -74,11 +74,8 @@ impl ItemHandle for BufferItemHandle {
Box::new(WeakBufferItemHandle(self.0.downgrade())) Box::new(WeakBufferItemHandle(self.0.downgrade()))
} }
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath> { fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry> {
File::from_dyn(self.0.read(cx).file()).map(|f| ProjectPath { File::from_dyn(self.0.read(cx).file()).and_then(|f| f.project_entry(cx))
worktree_id: f.worktree_id(cx),
path: f.path().clone(),
})
} }
fn id(&self) -> usize { fn id(&self) -> usize {
@ -134,11 +131,8 @@ impl ItemView for Editor {
} }
} }
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath> { fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry> {
File::from_dyn(self.buffer().read(cx).file(cx)).map(|file| ProjectPath { File::from_dyn(self.buffer().read(cx).file(cx)).and_then(|file| file.project_entry(cx))
worktree_id: file.worktree_id(cx),
path: file.path().clone(),
})
} }
fn clone_on_split(&self, cx: &mut ViewContext<Self>) -> Option<Self> fn clone_on_split(&self, cx: &mut ViewContext<Self>) -> Option<Self>
@ -163,7 +157,7 @@ impl ItemView for Editor {
} }
fn can_save(&self, cx: &AppContext) -> bool { fn can_save(&self, cx: &AppContext) -> bool {
self.project_path(cx).is_some() self.project_entry(cx).is_some()
} }
fn save(&mut self, cx: &mut ViewContext<Self>) -> Result<Task<Result<()>>> { fn save(&mut self, cx: &mut ViewContext<Self>) -> Result<Task<Result<()>>> {

8
crates/project/src/project.rs
View file

@ -567,6 +567,14 @@ impl Project {
} }
} }
pub fn path_for_entry(&self, entry: ProjectEntry, cx: &AppContext) -> Option<ProjectPath> {
let worktree = self.worktree_for_id(entry.worktree_id, cx)?.read(cx);
Some(ProjectPath {
worktree_id: entry.worktree_id,
path: worktree.entry_for_id(entry.entry_id)?.path.clone(),
})
}
pub fn is_running_disk_based_diagnostics(&self) -> bool { pub fn is_running_disk_based_diagnostics(&self) -> bool {
self.pending_disk_based_diagnostics > 0 self.pending_disk_based_diagnostics > 0
} }

9
crates/project/src/worktree.rs
View file

@ -1,7 +1,7 @@
use super::{ use super::{
fs::{self, Fs}, fs::{self, Fs},
ignore::IgnoreStack, ignore::IgnoreStack,
DiagnosticSummary, DiagnosticSummary, ProjectEntry,
}; };
use ::ignore::gitignore::{Gitignore, GitignoreBuilder}; use ::ignore::gitignore::{Gitignore, GitignoreBuilder};
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
@ -2372,6 +2372,13 @@ impl File {
pub fn worktree_id(&self, cx: &AppContext) -> WorktreeId { pub fn worktree_id(&self, cx: &AppContext) -> WorktreeId {
self.worktree.read(cx).id() self.worktree.read(cx).id()
} }
pub fn project_entry(&self, cx: &AppContext) -> Option<ProjectEntry> {
self.entry_id.map(|entry_id| ProjectEntry {
worktree_id: self.worktree_id(cx),
entry_id,
})
}
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]

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

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

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

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

67
crates/zed/src/zed.rs
View file

@ -268,9 +268,11 @@ mod tests {
.await .await
.unwrap(); .unwrap();
cx.read(|cx| { cx.read(|cx| {
let pane = workspace.read(cx).active_pane().read(cx); let workspace = workspace.read(cx);
let pane = workspace.active_pane().read(cx);
let entry = pane.active_item().unwrap().project_entry(cx).unwrap();
assert_eq!( assert_eq!(
pane.active_item().unwrap().project_path(cx), workspace.project().read(cx).path_for_entry(entry, cx),
Some(file1.clone()) Some(file1.clone())
); );
assert_eq!(pane.item_views().count(), 1); assert_eq!(pane.item_views().count(), 1);
@ -282,9 +284,11 @@ mod tests {
.await .await
.unwrap(); .unwrap();
cx.read(|cx| { cx.read(|cx| {
let pane = workspace.read(cx).active_pane().read(cx); let workspace = workspace.read(cx);
let pane = workspace.active_pane().read(cx);
let entry = pane.active_item().unwrap().project_entry(cx).unwrap();
assert_eq!( assert_eq!(
pane.active_item().unwrap().project_path(cx), workspace.project().read(cx).path_for_entry(entry, cx),
Some(file2.clone()) Some(file2.clone())
); );
assert_eq!(pane.item_views().count(), 2); assert_eq!(pane.item_views().count(), 2);
@ -298,9 +302,11 @@ mod tests {
assert_eq!(entry_1.id(), entry_1b.id()); assert_eq!(entry_1.id(), entry_1b.id());
cx.read(|cx| { cx.read(|cx| {
let pane = workspace.read(cx).active_pane().read(cx); let workspace = workspace.read(cx);
let pane = workspace.active_pane().read(cx);
let entry = pane.active_item().unwrap().project_entry(cx).unwrap();
assert_eq!( assert_eq!(
pane.active_item().unwrap().project_path(cx), workspace.project().read(cx).path_for_entry(entry, cx),
Some(file1.clone()) Some(file1.clone())
); );
assert_eq!(pane.item_views().count(), 2); assert_eq!(pane.item_views().count(), 2);
@ -315,13 +321,11 @@ mod tests {
.await .await
.unwrap(); .unwrap();
workspace.read_with(&cx, |w, cx| { workspace.read_with(&cx, |workspace, cx| {
let pane = workspace.active_pane().read(cx);
let entry = pane.active_item().unwrap().project_entry(cx).unwrap();
assert_eq!( assert_eq!(
w.active_pane() workspace.project().read(cx).path_for_entry(entry, cx),
.read(cx)
.active_item()
.unwrap()
.project_path(cx.as_ref()),
Some(file2.clone()) Some(file2.clone())
); );
}); });
@ -336,14 +340,22 @@ mod tests {
t1.await.unwrap(); t1.await.unwrap();
t2.await.unwrap(); t2.await.unwrap();
cx.read(|cx| { cx.read(|cx| {
let pane = workspace.read(cx).active_pane().read(cx); let workspace = workspace.read(cx);
let pane = workspace.active_pane().read(cx);
let entry = pane.active_item().unwrap().project_entry(cx).unwrap();
assert_eq!( assert_eq!(
pane.active_item().unwrap().project_path(cx), workspace.project().read(cx).path_for_entry(entry, cx),
Some(file3.clone()) Some(file3.clone())
); );
let pane_entries = pane let pane_entries = pane
.item_views() .item_views()
.map(|i| i.project_path(cx).unwrap()) .map(|i| {
workspace
.project()
.read(cx)
.path_for_entry(i.project_entry(cx).unwrap(), cx)
.unwrap()
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
assert_eq!(pane_entries, &[file1, file2, file3]); assert_eq!(pane_entries, &[file1, file2, file3]);
}); });
@ -666,8 +678,15 @@ mod tests {
.await .await
.unwrap(); .unwrap();
cx.read(|cx| { cx.read(|cx| {
let workspace = workspace.read(cx);
let pane1_entry = pane_1
.read(cx)
.active_item()
.unwrap()
.project_entry(cx)
.unwrap();
assert_eq!( assert_eq!(
pane_1.read(cx).active_item().unwrap().project_path(cx), workspace.project().read(cx).path_for_entry(pane1_entry, cx),
Some(file1.clone()) Some(file1.clone())
); );
}); });
@ -682,7 +701,15 @@ mod tests {
assert_ne!(pane_1, pane_2); assert_ne!(pane_1, pane_2);
let pane2_item = pane_2.read(cx).active_item().unwrap(); let pane2_item = pane_2.read(cx).active_item().unwrap();
assert_eq!(pane2_item.project_path(cx.as_ref()), Some(file1.clone())); let pane2_entry = pane2_item.project_entry(cx).unwrap();
assert_eq!(
workspace
.read(cx)
.project()
.read(cx)
.path_for_entry(pane2_entry, cx),
Some(file1.clone())
);
cx.dispatch_action(window_id, vec![pane_2.id()], &workspace::CloseActiveItem); cx.dispatch_action(window_id, vec![pane_2.id()], &workspace::CloseActiveItem);
let workspace = workspace.read(cx); let workspace = workspace.read(cx);
@ -862,7 +889,11 @@ mod tests {
let item = workspace.active_item(cx).unwrap(); let item = workspace.active_item(cx).unwrap();
let editor = item.to_any().downcast::<Editor>().unwrap(); let editor = item.to_any().downcast::<Editor>().unwrap();
let selections = editor.update(cx, |editor, cx| editor.selected_display_ranges(cx)); let selections = editor.update(cx, |editor, cx| editor.selected_display_ranges(cx));
(item.project_path(cx).unwrap(), selections[0].start) let path = workspace
.project()
.read(cx)
.path_for_entry(item.project_entry(cx).unwrap(), cx);
(path.unwrap(), selections[0].start)
}) })
} }
} }