Merge branch 'main' into ime-support-2

2022-07-25 10:47:49 +02:00
parent d3567e381c 8c1d4d877f
commit ca3e73106c
32 changed files with 2520 additions and 1790 deletions
@@ -317,15 +317,7 @@ mod tests {
        let (window_id, workspace) = cx.add_window(|cx| Workspace::new(project, cx));
        cx.dispatch_action(window_id, Toggle);

-        let finder = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .modal()
-                .cloned()
-                .unwrap()
-                .downcast::<FileFinder>()
-                .unwrap()
-        });
+        let finder = cx.read(|cx| workspace.read(cx).modal::<FileFinder>().unwrap());
        finder
            .update(cx, |finder, cx| {
                finder.update_matches("bna".to_string(), cx)