mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Allow opening entries from project panel

Browse source
This commit is contained in:
Antonio Scandurra 2021-09-29 13:08:27 +02:00
parent e030917769
commit 67c40eb4be
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zed/src/project_panel.rs
View file

@ -28,8 +28,8 @@ struct EntryDetails {
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub struct ProjectEntry {
worktree_ix: usize,
entry_id: usize,
pub worktree_ix: usize,
pub entry_id: usize,
}
action!(ToggleExpanded, ProjectEntry);

10
zed/src/workspace.rs
View file

@ -8,7 +8,7 @@ use crate::{
fs::Fs,
people_panel::{JoinWorktree, LeaveWorktree, PeoplePanel, ShareWorktree, UnshareWorktree},
project::Project,
project_panel::ProjectPanel,
project_panel::{self, ProjectPanel},
rpc,
settings::Settings,
user,
@ -54,6 +54,14 @@ pub fn init(cx: &mut MutableAppContext) {
cx.add_action(Workspace::save_active_item);
cx.add_action(Workspace::debug_elements);
cx.add_action(Workspace::open_new_file);
cx.add_action(|this: &mut Workspace, action: &project_panel::Open, cx| {
if let Some(worktree) = this.worktrees(cx).get(action.0.worktree_ix) {
if let Some(entry) = worktree.read(cx).entry_for_id(action.0.entry_id) {
this.open_entry((worktree.id(), entry.path.clone()), cx)
.map(|task| task.detach());
}
}
});
cx.add_action(Workspace::toggle_sidebar_item);
cx.add_action(Workspace::share_worktree);
cx.add_action(Workspace::unshare_worktree);

2
zed/src/worktree.rs
View file

@ -1582,7 +1582,7 @@ impl Snapshot {
})
}
fn entry_for_id(&self, id: usize) -> Option<&Entry> {
pub fn entry_for_id(&self, id: usize) -> Option<&Entry> {
let entry = self.entries_by_id.get(&id, &())?;
self.entry_for_path(&entry.path)
}