Merge remote-tracking branch 'origin/main' into screen-sharing

crates/workspace/src/workspace.rs

@@ -927,6 +927,9 @@ impl From<&dyn NotificationHandle> for AnyViewHandle {
 impl AppState {
     #[cfg(any(test, feature = "test-support"))]
     pub fn test(cx: &mut MutableAppContext) -> Arc<Self> {
+        use fs::HomeDir;
+
+        cx.set_global(HomeDir(Path::new("/tmp/").to_path_buf()));
         let settings = Settings::test(cx);
         cx.set_global(settings);
 
@@ -2665,7 +2668,7 @@ impl View for Workspace {
             .named("workspace")
     }
 
-    fn on_focus_in(&mut self, view: AnyViewHandle, cx: &mut ViewContext<Self>) {
+    fn focus_in(&mut self, view: AnyViewHandle, cx: &mut ViewContext<Self>) {
         if cx.is_self_focused() {
             cx.focus(&self.active_pane);
         } else {