Merge remote-tracking branch 'origin/main' into panels

2023-05-23 08:24:28 +02:00 · 2023-05-23 08:24:28 +02:00 · 208ff2fba7
commit 208ff2fba7
parent f22067b236 a5b5de5651
33 changed files with 827 additions and 309 deletions
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@ -2087,6 +2087,7 @@ mod tests {
            workspace::init(app_state.clone(), cx);
            language::init(cx);
            editor::init(cx);
+            project_panel::init_settings(cx);
            pane::init(cx);
            project_panel::init(cx);
            terminal_view::init(cx);