diff --git a/Cargo.lock b/Cargo.lock index e0bf9c1..b3ea1ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -487,7 +487,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -892,9 +892,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" +checksum = "a70e4329df6cb94385eed412ec92375c3cdd8a6e502493d1229b6414e4036dfa" dependencies = [ "async-channel", "async-task", @@ -959,7 +959,7 @@ checksum = "fc0e56a716f1e132ff6bf4bdac1c944a3fcdc1cae65f70a4a2a1ac3b401d2d1f" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -1268,7 +1268,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "gpui_util", "indexmap", @@ -1734,7 +1734,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "proc-macro2", "quote", @@ -1811,7 +1811,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -2304,7 +2304,7 @@ checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -2440,7 +2440,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -2863,9 +2863,9 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf125eae66b7d6e4395511a06c0d43a3c34eac96c8641fb98b22078faee65b8" +checksum = "380b9c423a54f0821064b954b5a5ab25c660812f6a91da03c3f1cb4b10762aa5" dependencies = [ "faster-hex", "gix-features", @@ -3025,9 +3025,9 @@ dependencies = [ [[package]] name = "gix-packetline" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3766025c72319c4accdd854a18e6f0dd176c8eb0f3bc8a60a7765be2b50cabf2" +checksum = "792bd92bea390087e6223b18d4d023decc36467de31e6b066b69b94beea1b9e2" dependencies = [ "bstr", "faster-hex", @@ -3489,7 +3489,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "accesskit", "anyhow", @@ -3511,7 +3511,6 @@ dependencies = [ "gpui_macros", "gpui_shared_string", "gpui_util", - "hdrhistogram", "heapless 0.9.3", "http_client", "image", @@ -3562,7 +3561,7 @@ dependencies = [ [[package]] name = "gpui-base" version = "0.5.2" -source = "git+https://github.com/longbridge/gpui-component#9e6d5000b4020e7849e167faa1f3ee8932480ff6" +source = "git+https://github.com/longbridge/gpui-component#7885c41663c7a6cc68ad0c99b1ba33550f807ff0" dependencies = [ "aho-corasick", "anyhow", @@ -3594,7 +3593,7 @@ dependencies = [ [[package]] name = "gpui-component" version = "0.5.2" -source = "git+https://github.com/longbridge/gpui-component#9e6d5000b4020e7849e167faa1f3ee8932480ff6" +source = "git+https://github.com/longbridge/gpui-component#7885c41663c7a6cc68ad0c99b1ba33550f807ff0" dependencies = [ "anyhow", "chrono", @@ -3674,7 +3673,7 @@ dependencies = [ [[package]] name = "gpui-component-assets" version = "0.5.1" -source = "git+https://github.com/longbridge/gpui-component#9e6d5000b4020e7849e167faa1f3ee8932480ff6" +source = "git+https://github.com/longbridge/gpui-component#7885c41663c7a6cc68ad0c99b1ba33550f807ff0" dependencies = [ "anyhow", "gpui", @@ -3688,7 +3687,7 @@ dependencies = [ [[package]] name = "gpui-component-macros" version = "0.5.1" -source = "git+https://github.com/longbridge/gpui-component#9e6d5000b4020e7849e167faa1f3ee8932480ff6" +source = "git+https://github.com/longbridge/gpui-component#7885c41663c7a6cc68ad0c99b1ba33550f807ff0" dependencies = [ "proc-macro2", "quote", @@ -3698,7 +3697,7 @@ dependencies = [ [[package]] name = "gpui_apple" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "anyhow", "block", @@ -3721,7 +3720,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "accesskit", "accesskit_unix", @@ -3767,7 +3766,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "accesskit", "accesskit_macos", @@ -3813,7 +3812,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3824,7 +3823,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "console_error_panic_hook", "gpui", @@ -3837,7 +3836,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "schemars", "serde", @@ -3847,7 +3846,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "anyhow", "log", @@ -3857,7 +3856,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "anyhow", "console_error_panic_hook", @@ -3881,7 +3880,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "anyhow", "bytemuck", @@ -3907,7 +3906,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "accesskit", "accesskit_windows", @@ -3944,9 +3943,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "839c0e8a181239723652be9062bb56ca5bf5f64011f73b623f6f4fc59086a228" +checksum = "ef8e5e5a340588f4452631496976cf8636d4a7ecf600239fdc27615d2530bc16" dependencies = [ "atomic-waker", "bytes", @@ -4032,20 +4031,6 @@ dependencies = [ "foldhash 0.2.0", ] -[[package]] -name = "hdrhistogram" -version = "7.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49d1053f4708f0af3cf9fc5bffc7e68a914a3c45becb231c80068c9c3f78bea" -dependencies = [ - "base64", - "byteorder", - "crossbeam-channel", - "flate2", - "nom 8.0.0", - "num-traits", -] - [[package]] name = "heapless" version = "0.8.0" @@ -4234,7 +4219,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "anyhow", "async-compression", @@ -4254,7 +4239,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "rustls", "rustls-platform-verifier 0.5.3", @@ -5230,7 +5215,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "anyhow", "bindgen", @@ -6132,9 +6117,9 @@ checksum = "4f933a4265d5cdad61d19bbdfc972ea5726d56cd8d3d57b8f2d3c365dd42bee9" [[package]] name = "open" -version = "5.4.1" +version = "5.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cfef937e9c486488c7e3d949ae31c0f1d06bdacd75b99c086cb35356e30408" +checksum = "ade3be4664bc1ef537ce133015f04c176b737815c2ba9fd60edf212d6e90dd55" dependencies = [ "is-wsl", "libc", @@ -6277,7 +6262,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "collections", "serde", @@ -7068,13 +7053,13 @@ checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "derive_refineable", ] @@ -7157,7 +7142,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "anyhow", "bytes", @@ -7569,7 +7554,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "async-task", "backtrace", @@ -7605,7 +7590,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -7776,7 +7761,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -7787,7 +7772,7 @@ checksum = "f852137cce035d6a4df67ccce505ff6b3e9fd3a10e3e52b24dc71e650bb1a9bd" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -7821,7 +7806,7 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -8211,7 +8196,7 @@ checksum = "6feeae42a2d6b0dcb8aeb2f08d9e48cdac600239cf8a20fc59f9e252e86bdfe1" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -8296,7 +8281,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "heapless 0.9.3", "log", @@ -8434,9 +8419,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" +checksum = "e6275cddf4610d1775e6d1fe9469b2e77d0f39fd98fb7450901b821e0c53649f" dependencies = [ "proc-macro2", "quote", @@ -8639,7 +8624,7 @@ checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -8776,7 +8761,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -9040,9 +9025,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.26.12" +version = "0.26.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c567a8e18ae93f20982c90370b16fd24023aeaf52f6052b96957ab253a0fec" +checksum = "17ebdd3a5a7e28a1890b876fdbd0c3c0fe0a6336cffaa104f11b9f720c9daa29" dependencies = [ "cc", "regex", @@ -9669,7 +9654,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "perf", "quote", @@ -11201,7 +11186,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", "zbus_names", "zvariant", "zvariant_utils", @@ -11455,7 +11440,7 @@ checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -11467,7 +11452,7 @@ checksum = "34b31d188d9d685a4f9c7b46d6e36631b07058d2cfe190267adce54dc230bf12" [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "anyhow", "chrono", @@ -11484,7 +11469,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" dependencies = [ "tracing", "tracing-subscriber", @@ -11495,7 +11480,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#d9ad6aff67e47de43abb270d22de75dd950f1b48" +source = "git+https://github.com/zed-industries/zed#5631830c564afa89b3aba679f45d9c3345f9460f" [[package]] name = "zune-core" @@ -11561,7 +11546,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", "zvariant_utils", ] @@ -11574,6 +11559,6 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 3.0.3", + "syn 3.0.4", "winnow 1.0.4", ] diff --git a/crates/dock/src/tab_panel.rs b/crates/dock/src/tab_panel.rs index 8bcb529..8d0bf79 100644 --- a/crates/dock/src/tab_panel.rs +++ b/crates/dock/src/tab_panel.rs @@ -334,7 +334,7 @@ impl SignedTabGroupSkin { // A bottom/right dock's only panel cannot be closed through the // group (base keeps a dock's last group), but the skin handles that // close by removing the whole dock, so the item is offered. - let closable = group.can_close() + let closable = group.is_closable() || (self.is_dock_root_group(group, cx).is_some() && group.active_panel().is_some_and(|panel| panel.closable(cx))); let buttons = handle.and_then(|handle| handle.toolbar_buttons(window, cx)); diff --git a/crates/dock/src/tiles.rs b/crates/dock/src/tiles.rs index ec5e86b..a8aaacd 100644 --- a/crates/dock/src/tiles.rs +++ b/crates/dock/src/tiles.rs @@ -118,9 +118,9 @@ impl SignedTilesSkin { let control = handle.and_then(|handle| handle.zoom_control(cx)); let zoomed = tile.is_zoomed(); let toolbar_zoom = - tile.can_zoom() && control.is_some_and(|control| control.toolbar_visible()); - let menu_zoom = tile.can_zoom() && control.is_some_and(|control| control.menu_visible()); - let closable = tile.can_close(); + tile.is_zoomable() && control.is_some_and(|control| control.toolbar_visible()); + let menu_zoom = tile.is_zoomable() && control.is_some_and(|control| control.menu_visible()); + let closable = tile.is_closable(); let buttons = handle.and_then(|handle| handle.toolbar_buttons(window, cx)); let panel = handle.map(|handle| handle.panel()); diff --git a/crates/workspace/src/views/repo_detail/issues.rs b/crates/workspace/src/views/repo_detail/issues.rs index 79408b0..880b3a9 100644 --- a/crates/workspace/src/views/repo_detail/issues.rs +++ b/crates/workspace/src/views/repo_detail/issues.rs @@ -122,7 +122,7 @@ impl IssuesView { let panel = cx.new(|cx| IssueDetailView::new(self.store.clone(), issue_id, window, cx)); dock_area.update(cx, |dock_area, cx| { - dock_area.add_panel_view(panel_handle(panel), DockPlacement::Bottom, None, window, cx); + dock_area.add_panel_view(panel_handle(panel), DockPlacement::Center, None, window, cx); }); } diff --git a/crates/workspace/src/views/repo_detail/pull_requests.rs b/crates/workspace/src/views/repo_detail/pull_requests.rs index 2abbe69..07546d1 100644 --- a/crates/workspace/src/views/repo_detail/pull_requests.rs +++ b/crates/workspace/src/views/repo_detail/pull_requests.rs @@ -125,7 +125,7 @@ impl PullRequestsView { let panel = cx.new(|cx| PullRequestDetailView::new(self.store.clone(), pr_id, window, cx)); dock_area.update(cx, |dock_area, cx| { - dock_area.add_panel_view(panel_handle(panel), DockPlacement::Bottom, None, window, cx); + dock_area.add_panel_view(panel_handle(panel), DockPlacement::Center, None, window, cx); }); } @@ -133,14 +133,16 @@ impl PullRequestsView { /// `pr_ix` the index of the pull request in the store's `pull_requests`. fn render_row(&self, ix: usize, pr_ix: usize, cx: &mut Context) -> AnyElement { let pr = &self.store.read(cx).pull_requests[pr_ix]; + let pr_id = pr.id; let title = activity_subject(pr); let id_hex = pr.id.to_hex(); + + let age = relative_time(pr.created_at); + let status = self.store.read(cx).status_of(pr); + let profile = ProfileStore::global(cx).read(cx).get(&pr.pubkey); let author = profile.name(); let picture = profile.picture(); - let age = relative_time(pr.created_at); - let status = self.store.read(cx).status_of(pr); - let pr_id = pr.id; h_flex() .id(ix) @@ -402,7 +404,6 @@ impl PullRequestsView { })), ), ) - // Spacer: pushes the button to the right edge. .child(div().flex_1()) .child( BaseButton::new("new-pr") diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index 0475a86..050c40e 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -54,13 +54,14 @@ impl Workspace { } let dock = dock_for_pruning.clone(); cx.spawn_in(window, async move |_, window| { - _ = dock.update_in(window, |area, window, cx| { + dock.update_in(window, |area, window, cx| { for placement in [DockPlacement::Bottom, DockPlacement::Right] { if area.is_empty(placement, cx) { area.remove_dock(placement, window, cx); } } - }); + }) + .ok(); }) .detach(); },