Merge branch 'main' into rename-element-traits

# Conflicts: # crates/gpui2/src/elements/uniform_list.rs # crates/ui2/src/components/context_menu.rs # crates/ui2/src/components/list.rs
2023-11-23 12:47:46 +01:00
parent c23f17ee0b f33c0e80a6
commit 3b918bfee8
34 changed files with 592 additions and 326 deletions
@@ -371,7 +371,7 @@ impl ProjectPanel {
        _entry_id: ProjectEntryId,
        _cx: &mut ViewContext<Self>,
    ) {
-        todo!()
+        // todo!()
        //     let project = self.project.read(cx);

        //     let worktree_id = if let Some(id) = project.worktree_id_for_entry(entry_id, cx) {