use editor::{Cancel, Editor}; use futures::stream::StreamExt; use gpui::{ actions, anyhow::{anyhow, Result}, elements::{ ChildView, ConstrainedBox, Empty, Flex, Label, MouseEventHandler, Overlay, ParentElement, ScrollTarget, Stack, Svg, UniformList, UniformListState, }, geometry::vector::Vector2F, impl_internal_actions, keymap, platform::CursorStyle, AppContext, Element, ElementBox, Entity, ModelHandle, MutableAppContext, PromptLevel, RenderContext, Task, View, ViewContext, ViewHandle, WeakViewHandle, }; use project::{Entry, EntryKind, Project, ProjectEntryId, ProjectPath, Worktree, WorktreeId}; use settings::Settings; use std::{ cmp::Ordering, collections::{hash_map, HashMap}, ffi::OsStr, ops::Range, }; use unicase::UniCase; use workspace::{ menu::{Confirm, SelectNext, SelectPrev}, Workspace, }; const NEW_ENTRY_ID: ProjectEntryId = ProjectEntryId::MAX; pub struct ProjectPanel { project: ModelHandle, list: UniformListState, visible_entries: Vec<(WorktreeId, Vec)>, expanded_dir_ids: HashMap>, selection: Option, edit_state: Option, filename_editor: ViewHandle, context_menu: Option, handle: WeakViewHandle, } #[derive(Copy, Clone)] struct Selection { worktree_id: WorktreeId, entry_id: ProjectEntryId, } #[derive(Clone, Debug)] struct EditState { worktree_id: WorktreeId, entry_id: ProjectEntryId, is_new_entry: bool, is_dir: bool, processing_filename: Option, } #[derive(Debug, PartialEq, Eq)] struct EntryDetails { filename: String, depth: usize, kind: EntryKind, is_ignored: bool, is_expanded: bool, is_selected: bool, is_editing: bool, is_processing: bool, } #[derive(Clone)] pub struct ToggleExpanded(pub ProjectEntryId); #[derive(Clone)] pub struct Open { pub entry_id: ProjectEntryId, pub change_focus: bool, } #[derive(Clone)] pub struct DeployContextMenu { pub position: Vector2F, pub entry_id: Option, } pub struct ContextMenu { pub position: Vector2F, pub entry_id: Option, } actions!( project_panel, [ ExpandSelectedEntry, CollapseSelectedEntry, AddDirectory, AddFile, Delete, Rename ] ); impl_internal_actions!(project_panel, [Open, ToggleExpanded, DeployContextMenu]); pub fn init(cx: &mut MutableAppContext) { cx.add_action(ProjectPanel::deploy_context_menu); cx.add_action(ProjectPanel::expand_selected_entry); cx.add_action(ProjectPanel::collapse_selected_entry); cx.add_action(ProjectPanel::toggle_expanded); cx.add_action(ProjectPanel::select_prev); cx.add_action(ProjectPanel::select_next); cx.add_action(ProjectPanel::open_entry); cx.add_action(ProjectPanel::add_file); cx.add_action(ProjectPanel::add_directory); cx.add_action(ProjectPanel::rename); cx.add_async_action(ProjectPanel::delete); cx.add_async_action(ProjectPanel::confirm); cx.add_action(ProjectPanel::cancel); } pub enum Event { OpenedEntry { entry_id: ProjectEntryId, focus_opened_item: bool, }, } impl ProjectPanel { pub fn new(project: ModelHandle, cx: &mut ViewContext) -> ViewHandle { let project_panel = cx.add_view(|cx: &mut ViewContext| { cx.observe(&project, |this, _, cx| { this.update_visible_entries(None, cx); cx.notify(); }) .detach(); cx.subscribe(&project, |this, project, event, cx| match event { project::Event::ActiveEntryChanged(Some(entry_id)) => { if let Some(worktree_id) = project.read(cx).worktree_id_for_entry(*entry_id, cx) { this.expand_entry(worktree_id, *entry_id, cx); this.update_visible_entries(Some((worktree_id, *entry_id)), cx); this.autoscroll(); cx.notify(); } } project::Event::WorktreeRemoved(id) => { this.expanded_dir_ids.remove(id); this.update_visible_entries(None, cx); cx.notify(); } _ => {} }) .detach(); let filename_editor = cx.add_view(|cx| { Editor::single_line( Some(|theme| { let mut style = theme.project_panel.filename_editor.clone(); style.container.background_color.take(); style }), cx, ) }); let mut this = Self { project: project.clone(), list: Default::default(), visible_entries: Default::default(), expanded_dir_ids: Default::default(), selection: None, edit_state: None, filename_editor, context_menu: None, handle: cx.weak_handle(), }; this.update_visible_entries(None, cx); this }); cx.subscribe(&project_panel, { let project_panel = project_panel.downgrade(); move |workspace, _, event, cx| match event { &Event::OpenedEntry { entry_id, focus_opened_item, } => { if let Some(worktree) = project.read(cx).worktree_for_entry(entry_id, cx) { if let Some(entry) = worktree.read(cx).entry_for_id(entry_id) { workspace .open_path( ProjectPath { worktree_id: worktree.read(cx).id(), path: entry.path.clone(), }, focus_opened_item, cx, ) .detach_and_log_err(cx); if !focus_opened_item { if let Some(project_panel) = project_panel.upgrade(cx) { cx.focus(&project_panel); } } } } } } }) .detach(); project_panel } fn deploy_context_menu(&mut self, action: &DeployContextMenu, cx: &mut ViewContext) { self.context_menu = Some(ContextMenu { position: action.position, entry_id: action.entry_id, }); cx.notify(); } fn expand_selected_entry(&mut self, _: &ExpandSelectedEntry, cx: &mut ViewContext) { if let Some((worktree, entry)) = self.selected_entry(cx) { let expanded_dir_ids = if let Some(expanded_dir_ids) = self.expanded_dir_ids.get_mut(&worktree.id()) { expanded_dir_ids } else { return; }; if entry.is_dir() { match expanded_dir_ids.binary_search(&entry.id) { Ok(_) => self.select_next(&SelectNext, cx), Err(ix) => { expanded_dir_ids.insert(ix, entry.id); self.update_visible_entries(None, cx); cx.notify(); } } } else { let event = Event::OpenedEntry { entry_id: entry.id, focus_opened_item: true, }; cx.emit(event); } } } fn collapse_selected_entry(&mut self, _: &CollapseSelectedEntry, cx: &mut ViewContext) { if let Some((worktree, mut entry)) = self.selected_entry(cx) { let expanded_dir_ids = if let Some(expanded_dir_ids) = self.expanded_dir_ids.get_mut(&worktree.id()) { expanded_dir_ids } else { return; }; loop { match expanded_dir_ids.binary_search(&entry.id) { Ok(ix) => { expanded_dir_ids.remove(ix); self.update_visible_entries(Some((worktree.id(), entry.id)), cx); cx.notify(); break; } Err(_) => { if let Some(parent_entry) = entry.path.parent().and_then(|p| worktree.entry_for_path(p)) { entry = parent_entry; } else { break; } } } } } } fn toggle_expanded(&mut self, action: &ToggleExpanded, cx: &mut ViewContext) { let entry_id = action.0; if let Some(worktree_id) = self.project.read(cx).worktree_id_for_entry(entry_id, cx) { if let Some(expanded_dir_ids) = self.expanded_dir_ids.get_mut(&worktree_id) { match expanded_dir_ids.binary_search(&entry_id) { Ok(ix) => { expanded_dir_ids.remove(ix); } Err(ix) => { expanded_dir_ids.insert(ix, entry_id); } } self.update_visible_entries(Some((worktree_id, entry_id)), cx); cx.focus_self(); } } } fn select_prev(&mut self, _: &SelectPrev, cx: &mut ViewContext) { if let Some(selection) = self.selection { let (mut worktree_ix, mut entry_ix, _) = self.index_for_selection(selection).unwrap_or_default(); if entry_ix > 0 { entry_ix -= 1; } else { if worktree_ix > 0 { worktree_ix -= 1; entry_ix = self.visible_entries[worktree_ix].1.len() - 1; } else { return; } } let (worktree_id, worktree_entries) = &self.visible_entries[worktree_ix]; self.selection = Some(Selection { worktree_id: *worktree_id, entry_id: worktree_entries[entry_ix].id, }); self.autoscroll(); cx.notify(); } else { self.select_first(cx); } } fn confirm(&mut self, _: &Confirm, cx: &mut ViewContext) -> Option>> { let edit_state = self.edit_state.as_mut()?; cx.focus_self(); let worktree_id = edit_state.worktree_id; let worktree = self.project.read(cx).worktree_for_id(worktree_id, cx)?; let entry = worktree.read(cx).entry_for_id(edit_state.entry_id)?.clone(); let filename = self.filename_editor.read(cx).text(cx); let edit_task; let edited_entry_id; if edit_state.is_new_entry { self.selection = Some(Selection { worktree_id, entry_id: NEW_ENTRY_ID, }); let new_path = entry.path.join(&filename); edited_entry_id = NEW_ENTRY_ID; edit_task = self.project.update(cx, |project, cx| { project.create_entry((edit_state.worktree_id, new_path), edit_state.is_dir, cx) })?; } else { let new_path = if let Some(parent) = entry.path.clone().parent() { parent.join(&filename) } else { filename.clone().into() }; edited_entry_id = entry.id; edit_task = self.project.update(cx, |project, cx| { project.rename_entry(entry.id, new_path, cx) })?; }; edit_state.processing_filename = Some(filename); cx.notify(); Some(cx.spawn(|this, mut cx| async move { let new_entry = edit_task.await; this.update(&mut cx, |this, cx| { this.edit_state.take(); cx.notify(); }); let new_entry = new_entry?; this.update(&mut cx, |this, cx| { if let Some(selection) = &mut this.selection { if selection.entry_id == edited_entry_id { selection.worktree_id = worktree_id; selection.entry_id = new_entry.id; } } this.update_visible_entries(None, cx); cx.notify(); }); Ok(()) })) } fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext) { self.edit_state = None; self.update_visible_entries(None, cx); cx.focus_self(); cx.notify(); } fn open_entry(&mut self, action: &Open, cx: &mut ViewContext) { cx.emit(Event::OpenedEntry { entry_id: action.entry_id, focus_opened_item: action.change_focus, }); } fn add_file(&mut self, _: &AddFile, cx: &mut ViewContext) { self.add_entry(false, cx) } fn add_directory(&mut self, _: &AddDirectory, cx: &mut ViewContext) { self.add_entry(true, cx) } fn add_entry(&mut self, is_dir: bool, cx: &mut ViewContext) { if let Some(Selection { worktree_id, entry_id, }) = self.selection { let directory_id; if let Some((worktree, expanded_dir_ids)) = self .project .read(cx) .worktree_for_id(worktree_id, cx) .zip(self.expanded_dir_ids.get_mut(&worktree_id)) { let worktree = worktree.read(cx); if let Some(mut entry) = worktree.entry_for_id(entry_id) { loop { if entry.is_dir() { if let Err(ix) = expanded_dir_ids.binary_search(&entry.id) { expanded_dir_ids.insert(ix, entry.id); } directory_id = entry.id; break; } else { if let Some(parent_path) = entry.path.parent() { if let Some(parent_entry) = worktree.entry_for_path(parent_path) { entry = parent_entry; continue; } } return; } } } else { return; }; } else { return; }; self.edit_state = Some(EditState { worktree_id, entry_id: directory_id, is_new_entry: true, is_dir, processing_filename: None, }); self.filename_editor .update(cx, |editor, cx| editor.clear(cx)); cx.focus(&self.filename_editor); self.update_visible_entries(Some((worktree_id, NEW_ENTRY_ID)), cx); cx.notify(); } } fn rename(&mut self, _: &Rename, cx: &mut ViewContext) { if let Some(Selection { worktree_id, entry_id, }) = self.selection { if let Some(worktree) = self.project.read(cx).worktree_for_id(worktree_id, cx) { if let Some(entry) = worktree.read(cx).entry_for_id(entry_id) { self.edit_state = Some(EditState { worktree_id, entry_id, is_new_entry: false, is_dir: entry.is_dir(), processing_filename: None, }); let filename = entry .path .file_name() .map_or(String::new(), |s| s.to_string_lossy().to_string()); self.filename_editor.update(cx, |editor, cx| { editor.set_text(filename, cx); editor.select_all(&Default::default(), cx); }); cx.focus(&self.filename_editor); self.update_visible_entries(None, cx); cx.notify(); } } } } fn delete(&mut self, _: &Delete, cx: &mut ViewContext) -> Option>> { let Selection { entry_id, .. } = self.selection?; let path = self.project.read(cx).path_for_entry(entry_id, cx)?.path; let file_name = path.file_name()?; let mut answer = cx.prompt( PromptLevel::Info, &format!("Delete {file_name:?}?"), &["Delete", "Cancel"], ); Some(cx.spawn(|this, mut cx| async move { if answer.next().await != Some(0) { return Ok(()); } this.update(&mut cx, |this, cx| { this.project .update(cx, |project, cx| project.delete_entry(entry_id, cx)) .ok_or_else(|| anyhow!("no such entry")) })? .await })) } fn select_next(&mut self, _: &SelectNext, cx: &mut ViewContext) { if let Some(selection) = self.selection { let (mut worktree_ix, mut entry_ix, _) = self.index_for_selection(selection).unwrap_or_default(); if let Some((_, worktree_entries)) = self.visible_entries.get(worktree_ix) { if entry_ix + 1 < worktree_entries.len() { entry_ix += 1; } else { worktree_ix += 1; entry_ix = 0; } } if let Some((worktree_id, worktree_entries)) = self.visible_entries.get(worktree_ix) { if let Some(entry) = worktree_entries.get(entry_ix) { self.selection = Some(Selection { worktree_id: *worktree_id, entry_id: entry.id, }); self.autoscroll(); cx.notify(); } } } else { self.select_first(cx); } } fn select_first(&mut self, cx: &mut ViewContext) { let worktree = self .visible_entries .first() .and_then(|(worktree_id, _)| self.project.read(cx).worktree_for_id(*worktree_id, cx)); if let Some(worktree) = worktree { let worktree = worktree.read(cx); let worktree_id = worktree.id(); if let Some(root_entry) = worktree.root_entry() { self.selection = Some(Selection { worktree_id, entry_id: root_entry.id, }); self.autoscroll(); cx.notify(); } } } fn autoscroll(&mut self) { if let Some((_, _, index)) = self.selection.and_then(|s| self.index_for_selection(s)) { self.list.scroll_to(ScrollTarget::Show(index)); } } fn index_for_selection(&self, selection: Selection) -> Option<(usize, usize, usize)> { let mut worktree_index = 0; let mut entry_index = 0; let mut visible_entries_index = 0; for (worktree_id, worktree_entries) in &self.visible_entries { if *worktree_id == selection.worktree_id { for entry in worktree_entries { if entry.id == selection.entry_id { return Some((worktree_index, entry_index, visible_entries_index)); } else { visible_entries_index += 1; entry_index += 1; } } break; } else { visible_entries_index += worktree_entries.len(); } worktree_index += 1; } None } fn selected_entry<'a>(&self, cx: &'a AppContext) -> Option<(&'a Worktree, &'a project::Entry)> { let selection = self.selection?; let project = self.project.read(cx); let worktree = project.worktree_for_id(selection.worktree_id, cx)?.read(cx); Some((worktree, worktree.entry_for_id(selection.entry_id)?)) } fn update_visible_entries( &mut self, new_selected_entry: Option<(WorktreeId, ProjectEntryId)>, cx: &mut ViewContext, ) { let worktrees = self .project .read(cx) .worktrees(cx) .filter(|worktree| worktree.read(cx).is_visible()); self.visible_entries.clear(); for worktree in worktrees { let snapshot = worktree.read(cx).snapshot(); let worktree_id = snapshot.id(); let expanded_dir_ids = match self.expanded_dir_ids.entry(worktree_id) { hash_map::Entry::Occupied(e) => e.into_mut(), hash_map::Entry::Vacant(e) => { // The first time a worktree's root entry becomes available, // mark that root entry as expanded. if let Some(entry) = snapshot.root_entry() { e.insert(vec![entry.id]).as_slice() } else { &[] } } }; let mut new_entry_parent_id = None; let mut new_entry_kind = EntryKind::Dir; if let Some(edit_state) = &self.edit_state { if edit_state.worktree_id == worktree_id && edit_state.is_new_entry { new_entry_parent_id = Some(edit_state.entry_id); new_entry_kind = if edit_state.is_dir { EntryKind::Dir } else { EntryKind::File(Default::default()) }; } } let mut visible_worktree_entries = Vec::new(); let mut entry_iter = snapshot.entries(true); while let Some(entry) = entry_iter.entry() { visible_worktree_entries.push(entry.clone()); if Some(entry.id) == new_entry_parent_id { visible_worktree_entries.push(Entry { id: NEW_ENTRY_ID, kind: new_entry_kind, path: entry.path.join("\0").into(), inode: 0, mtime: entry.mtime, is_symlink: false, is_ignored: false, }); } if expanded_dir_ids.binary_search(&entry.id).is_err() { if entry_iter.advance_to_sibling() { continue; } } entry_iter.advance(); } visible_worktree_entries.sort_by(|entry_a, entry_b| { let mut components_a = entry_a.path.components().peekable(); let mut components_b = entry_b.path.components().peekable(); loop { match (components_a.next(), components_b.next()) { (Some(component_a), Some(component_b)) => { let a_is_file = components_a.peek().is_none() && entry_a.is_file(); let b_is_file = components_b.peek().is_none() && entry_b.is_file(); let ordering = a_is_file.cmp(&b_is_file).then_with(|| { let name_a = UniCase::new(component_a.as_os_str().to_string_lossy()); let name_b = UniCase::new(component_b.as_os_str().to_string_lossy()); name_a.cmp(&name_b) }); if !ordering.is_eq() { return ordering; } } (Some(_), None) => break Ordering::Greater, (None, Some(_)) => break Ordering::Less, (None, None) => break Ordering::Equal, } } }); self.visible_entries .push((worktree_id, visible_worktree_entries)); } if let Some((worktree_id, entry_id)) = new_selected_entry { self.selection = Some(Selection { worktree_id, entry_id, }); } } fn expand_entry( &mut self, worktree_id: WorktreeId, entry_id: ProjectEntryId, cx: &mut ViewContext, ) { let project = self.project.read(cx); if let Some((worktree, expanded_dir_ids)) = project .worktree_for_id(worktree_id, cx) .zip(self.expanded_dir_ids.get_mut(&worktree_id)) { let worktree = worktree.read(cx); if let Some(mut entry) = worktree.entry_for_id(entry_id) { loop { if let Err(ix) = expanded_dir_ids.binary_search(&entry.id) { expanded_dir_ids.insert(ix, entry.id); } if let Some(parent_entry) = entry.path.parent().and_then(|p| worktree.entry_for_path(p)) { entry = parent_entry; } else { break; } } } } } fn for_each_visible_entry( &self, range: Range, cx: &mut ViewContext, mut callback: impl FnMut(ProjectEntryId, EntryDetails, &mut ViewContext), ) { let mut ix = 0; for (worktree_id, visible_worktree_entries) in &self.visible_entries { if ix >= range.end { return; } if ix + visible_worktree_entries.len() <= range.start { ix += visible_worktree_entries.len(); continue; } let end_ix = range.end.min(ix + visible_worktree_entries.len()); if let Some(worktree) = self.project.read(cx).worktree_for_id(*worktree_id, cx) { let snapshot = worktree.read(cx).snapshot(); let expanded_entry_ids = self .expanded_dir_ids .get(&snapshot.id()) .map(Vec::as_slice) .unwrap_or(&[]); let root_name = OsStr::new(snapshot.root_name()); for entry in &visible_worktree_entries[range.start.saturating_sub(ix)..end_ix - ix] { let mut details = EntryDetails { filename: entry .path .file_name() .unwrap_or(root_name) .to_string_lossy() .to_string(), depth: entry.path.components().count(), kind: entry.kind, is_ignored: entry.is_ignored, is_expanded: expanded_entry_ids.binary_search(&entry.id).is_ok(), is_selected: self.selection.map_or(false, |e| { e.worktree_id == snapshot.id() && e.entry_id == entry.id }), is_editing: false, is_processing: false, }; if let Some(edit_state) = &self.edit_state { let is_edited_entry = if edit_state.is_new_entry { entry.id == NEW_ENTRY_ID } else { entry.id == edit_state.entry_id }; if is_edited_entry { if let Some(processing_filename) = &edit_state.processing_filename { details.is_processing = true; details.filename.clear(); details.filename.push_str(&processing_filename); } else { if edit_state.is_new_entry { details.filename.clear(); } details.is_editing = true; } } } callback(entry.id, details, cx); } } ix = end_ix; } } fn render_entry( entry_id: ProjectEntryId, details: EntryDetails, editor: &ViewHandle, theme: &theme::ProjectPanel, cx: &mut ViewContext, ) -> ElementBox { let kind = details.kind; let show_editor = details.is_editing && !details.is_processing; MouseEventHandler::new::(entry_id.to_usize(), cx, |state, _| { let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width; let mut style = theme.entry.style_for(state, details.is_selected).clone(); if details.is_ignored { style.text.color.fade_out(theme.ignored_entry_fade); style.icon_color.fade_out(theme.ignored_entry_fade); } let row_container_style = if show_editor { theme.filename_editor.container } else { style.container }; Flex::row() .with_child( ConstrainedBox::new(if kind == EntryKind::Dir { if details.is_expanded { Svg::new("icons/disclosure-open.svg") .with_color(style.icon_color) .boxed() } else { Svg::new("icons/disclosure-closed.svg") .with_color(style.icon_color) .boxed() } } else { Empty::new().boxed() }) .with_max_width(style.icon_size) .with_max_height(style.icon_size) .aligned() .constrained() .with_width(style.icon_size) .boxed(), ) .with_child(if show_editor { ChildView::new(editor.clone()) .contained() .with_margin_left(theme.entry.default.icon_spacing) .aligned() .left() .flex(1.0, true) .boxed() } else { Label::new(details.filename, style.text.clone()) .contained() .with_margin_left(style.icon_spacing) .aligned() .left() .boxed() }) .constrained() .with_height(theme.entry.default.height) .contained() .with_style(row_container_style) .with_padding_left(padding) .boxed() }) .on_click(move |_, click_count, cx| { if kind == EntryKind::Dir { cx.dispatch_action(ToggleExpanded(entry_id)) } else { cx.dispatch_action(Open { entry_id, change_focus: click_count > 1, }) } }) .on_right_mouse_down(move |position, cx| { cx.dispatch_action(DeployContextMenu { entry_id: Some(entry_id), position, }) }) .with_cursor_style(CursorStyle::PointingHand) .boxed() } fn render_context_menu(&self, cx: &mut RenderContext) -> Option { self.context_menu.as_ref().map(|menu| { let style = &cx.global::().theme.project_panel.context_menu; Overlay::new( Flex::column() .with_child(Label::new("Add File".to_string(), style.label.clone()).boxed()) .contained() .with_style(style.container) // .constrained() // .with_width(style.width) .boxed(), ) .with_abs_position(menu.position) .named("Project Panel Context Menu") }) } } impl View for ProjectPanel { fn ui_name() -> &'static str { "ProjectPanel" } fn render(&mut self, cx: &mut gpui::RenderContext<'_, Self>) -> gpui::ElementBox { let theme = &cx.global::().theme.project_panel; let mut container_style = theme.container; let padding = std::mem::take(&mut container_style.padding); let handle = self.handle.clone(); Stack::new() .with_child( UniformList::new( self.list.clone(), self.visible_entries .iter() .map(|(_, worktree_entries)| worktree_entries.len()) .sum(), move |range, items, cx| { let theme = cx.global::().theme.clone(); let this = handle.upgrade(cx).unwrap(); this.update(cx.app, |this, cx| { this.for_each_visible_entry(range.clone(), cx, |id, details, cx| { items.push(Self::render_entry( id, details, &this.filename_editor, &theme.project_panel, cx, )); }); }) }, ) .with_padding_top(padding.top) .with_padding_bottom(padding.bottom) .contained() .with_style(container_style) .boxed(), ) .with_children(self.render_context_menu(cx)) .boxed() } fn keymap_context(&self, _: &AppContext) -> keymap::Context { let mut cx = Self::default_keymap_context(); cx.set.insert("menu".into()); cx } } impl Entity for ProjectPanel { type Event = Event; } impl workspace::sidebar::SidebarItem for ProjectPanel { fn should_show_badge(&self, _: &AppContext) -> bool { false } } #[cfg(test)] mod tests { use super::*; use gpui::{TestAppContext, ViewHandle}; use project::FakeFs; use serde_json::json; use std::{collections::HashSet, path::Path}; #[gpui::test] async fn test_visible_list(cx: &mut gpui::TestAppContext) { cx.foreground().forbid_parking(); cx.update(|cx| { let settings = Settings::test(cx); cx.set_global(settings); }); let fs = FakeFs::new(cx.background()); fs.insert_tree( "/root1", json!({ ".dockerignore": "", ".git": { "HEAD": "", }, "a": { "0": { "q": "", "r": "", "s": "" }, "1": { "t": "", "u": "" }, "2": { "v": "", "w": "", "x": "", "y": "" }, }, "b": { "3": { "Q": "" }, "4": { "R": "", "S": "", "T": "", "U": "" }, }, "C": { "5": {}, "6": { "V": "", "W": "" }, "7": { "X": "" }, "8": { "Y": {}, "Z": "" } } }), ) .await; fs.insert_tree( "/root2", json!({ "d": { "9": "" }, "e": {} }), ) .await; let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await; let (_, workspace) = cx.add_window(|cx| Workspace::new(project.clone(), cx)); let panel = workspace.update(cx, |_, cx| ProjectPanel::new(project, cx)); assert_eq!( visible_entries_as_strings(&panel, 0..50, cx), &[ "v root1", " > .git", " > a", " > b", " > C", " .dockerignore", "v root2", " > d", " > e", ] ); toggle_expand_dir(&panel, "root1/b", cx); assert_eq!( visible_entries_as_strings(&panel, 0..50, cx), &[ "v root1", " > .git", " > a", " v b <== selected", " > 3", " > 4", " > C", " .dockerignore", "v root2", " > d", " > e", ] ); assert_eq!( visible_entries_as_strings(&panel, 6..9, cx), &[ // " > C", " .dockerignore", "v root2", ] ); } #[gpui::test(iterations = 30)] async fn test_editing_files(cx: &mut gpui::TestAppContext) { cx.foreground().forbid_parking(); cx.update(|cx| { let settings = Settings::test(cx); cx.set_global(settings); }); let fs = FakeFs::new(cx.background()); fs.insert_tree( "/root1", json!({ ".dockerignore": "", ".git": { "HEAD": "", }, "a": { "0": { "q": "", "r": "", "s": "" }, "1": { "t": "", "u": "" }, "2": { "v": "", "w": "", "x": "", "y": "" }, }, "b": { "3": { "Q": "" }, "4": { "R": "", "S": "", "T": "", "U": "" }, }, "C": { "5": {}, "6": { "V": "", "W": "" }, "7": { "X": "" }, "8": { "Y": {}, "Z": "" } } }), ) .await; fs.insert_tree( "/root2", json!({ "d": { "9": "" }, "e": {} }), ) .await; let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await; let (_, workspace) = cx.add_window(|cx| Workspace::new(project.clone(), cx)); let panel = workspace.update(cx, |_, cx| ProjectPanel::new(project, cx)); select_path(&panel, "root1", cx); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1 <== selected", " > .git", " > a", " > b", " > C", " .dockerignore", "v root2", " > d", " > e", ] ); // Add a file with the root folder selected. The filename editor is placed // before the first file in the root folder. panel.update(cx, |panel, cx| panel.add_file(&AddFile, cx)); assert!(panel.read_with(cx, |panel, cx| panel.filename_editor.is_focused(cx))); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " > b", " > C", " [EDITOR: ''] <== selected", " .dockerignore", "v root2", " > d", " > e", ] ); let confirm = panel.update(cx, |panel, cx| { panel .filename_editor .update(cx, |editor, cx| editor.set_text("the-new-filename", cx)); panel.confirm(&Confirm, cx).unwrap() }); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " > b", " > C", " [PROCESSING: 'the-new-filename'] <== selected", " .dockerignore", "v root2", " > d", " > e", ] ); confirm.await.unwrap(); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " > b", " > C", " .dockerignore", " the-new-filename <== selected", "v root2", " > d", " > e", ] ); select_path(&panel, "root1/b", cx); panel.update(cx, |panel, cx| panel.add_file(&AddFile, cx)); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " v b", " > 3", " > 4", " [EDITOR: ''] <== selected", " > C", " .dockerignore", " the-new-filename", ] ); panel .update(cx, |panel, cx| { panel .filename_editor .update(cx, |editor, cx| editor.set_text("another-filename", cx)); panel.confirm(&Confirm, cx).unwrap() }) .await .unwrap(); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " v b", " > 3", " > 4", " another-filename <== selected", " > C", " .dockerignore", " the-new-filename", ] ); select_path(&panel, "root1/b/another-filename", cx); panel.update(cx, |panel, cx| panel.rename(&Rename, cx)); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " v b", " > 3", " > 4", " [EDITOR: 'another-filename'] <== selected", " > C", " .dockerignore", " the-new-filename", ] ); let confirm = panel.update(cx, |panel, cx| { panel .filename_editor .update(cx, |editor, cx| editor.set_text("a-different-filename", cx)); panel.confirm(&Confirm, cx).unwrap() }); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " v b", " > 3", " > 4", " [PROCESSING: 'a-different-filename'] <== selected", " > C", " .dockerignore", " the-new-filename", ] ); confirm.await.unwrap(); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " v b", " > 3", " > 4", " a-different-filename <== selected", " > C", " .dockerignore", " the-new-filename", ] ); panel.update(cx, |panel, cx| panel.add_directory(&AddDirectory, cx)); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " v b", " > [EDITOR: ''] <== selected", " > 3", " > 4", " a-different-filename", " > C", " .dockerignore", ] ); let confirm = panel.update(cx, |panel, cx| { panel .filename_editor .update(cx, |editor, cx| editor.set_text("new-dir", cx)); panel.confirm(&Confirm, cx).unwrap() }); panel.update(cx, |panel, cx| panel.select_next(&Default::default(), cx)); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " v b", " > [PROCESSING: 'new-dir']", " > 3 <== selected", " > 4", " a-different-filename", " > C", " .dockerignore", ] ); confirm.await.unwrap(); assert_eq!( visible_entries_as_strings(&panel, 0..10, cx), &[ "v root1", " > .git", " > a", " v b", " > 3 <== selected", " > 4", " > new-dir", " a-different-filename", " > C", " .dockerignore", ] ); } fn toggle_expand_dir( panel: &ViewHandle, path: impl AsRef, cx: &mut TestAppContext, ) { let path = path.as_ref(); panel.update(cx, |panel, cx| { for worktree in panel.project.read(cx).worktrees(cx).collect::>() { let worktree = worktree.read(cx); if let Ok(relative_path) = path.strip_prefix(worktree.root_name()) { let entry_id = worktree.entry_for_path(relative_path).unwrap().id; panel.toggle_expanded(&ToggleExpanded(entry_id), cx); return; } } panic!("no worktree for path {:?}", path); }); } fn select_path( panel: &ViewHandle, path: impl AsRef, cx: &mut TestAppContext, ) { let path = path.as_ref(); panel.update(cx, |panel, cx| { for worktree in panel.project.read(cx).worktrees(cx).collect::>() { let worktree = worktree.read(cx); if let Ok(relative_path) = path.strip_prefix(worktree.root_name()) { let entry_id = worktree.entry_for_path(relative_path).unwrap().id; panel.selection = Some(Selection { worktree_id: worktree.id(), entry_id, }); return; } } panic!("no worktree for path {:?}", path); }); } fn visible_entries_as_strings( panel: &ViewHandle, range: Range, cx: &mut TestAppContext, ) -> Vec { let mut result = Vec::new(); let mut project_entries = HashSet::new(); let mut has_editor = false; panel.update(cx, |panel, cx| { panel.for_each_visible_entry(range, cx, |project_entry, details, _| { if details.is_editing { assert!(!has_editor, "duplicate editor entry"); has_editor = true; } else { assert!( project_entries.insert(project_entry), "duplicate project entry {:?} {:?}", project_entry, details ); } let indent = " ".repeat(details.depth); let icon = if matches!(details.kind, EntryKind::Dir | EntryKind::PendingDir) { if details.is_expanded { "v " } else { "> " } } else { " " }; let name = if details.is_editing { format!("[EDITOR: '{}']", details.filename) } else if details.is_processing { format!("[PROCESSING: '{}']", details.filename) } else { details.filename.clone() }; let selected = if details.is_selected { " <== selected" } else { "" }; result.push(format!("{indent}{icon}{name}{selected}")); }); }); result } }