From 92d862e1fa4baca0806224173d40112b89330cfa Mon Sep 17 00:00:00 2001 From: reya Date: Tue, 27 May 2025 07:44:17 +0700 Subject: [PATCH] chore: update gpui --- Cargo.lock | 352 ++++++++++-------------- crates/ui/src/context_menu.rs | 7 + crates/ui/src/dock_area/dock.rs | 7 + crates/ui/src/input/element.rs | 7 + crates/ui/src/popover.rs | 7 + crates/ui/src/resizable/panel.rs | 7 + crates/ui/src/scroll/scrollable.rs | 7 + crates/ui/src/scroll/scrollable_mask.rs | 7 + crates/ui/src/scroll/scrollbar.rs | 7 + crates/ui/src/switch.rs | 7 + crates/ui/src/title_bar.rs | 9 +- crates/ui/src/window_border.rs | 4 +- 12 files changed, 210 insertions(+), 218 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 696093e..a9f6cf3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,56 +97,6 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" - -[[package]] -name = "anstyle-parse" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" -dependencies = [ - "anstyle", - "once_cell", - "windows-sys 0.59.0", -] - [[package]] name = "anyhow" version = "1.0.98" @@ -250,6 +200,20 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-compression" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07" +dependencies = [ + "deflate64", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", +] + [[package]] name = "async-executor" version = "1.13.2" @@ -277,9 +241,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" +checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3" dependencies = [ "async-lock", "cfg-if", @@ -288,7 +252,7 @@ dependencies = [ "futures-lite 2.6.0", "parking", "polling", - "rustix 0.38.44", + "rustix 1.0.7", "slab", "tracing", "windows-sys 0.59.0", @@ -412,6 +376,19 @@ dependencies = [ "web-sys", ] +[[package]] +name = "async_zip" +version = "0.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b9f7252833d5ed4b00aa9604b563529dd5e11de9c23615de2dcdf91eb87b52" +dependencies = [ + "async-compression", + "crc32fast", + "futures-lite 2.6.0", + "pin-project", + "thiserror 1.0.69", +] + [[package]] name = "atomic" version = "0.5.3" @@ -874,9 +851,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.23" +version = "1.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" +checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7" dependencies = [ "jobserver", "libc", @@ -1009,46 +986,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "clap" -version = "4.5.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.101", -] - -[[package]] -name = "clap_lex" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" - [[package]] name = "cmake" version = "0.1.54" @@ -1076,14 +1013,14 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" +checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c" dependencies = [ "bitflags 2.9.1", "block", - "cocoa-foundation 0.2.0", - "core-foundation 0.10.0", + "cocoa-foundation 0.2.1", + "core-foundation 0.10.1", "core-graphics 0.24.0", "foreign-types 0.5.0", "libc", @@ -1106,15 +1043,14 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" +checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d" dependencies = [ "bitflags 2.9.1", "block", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-graphics-types 0.2.0", - "libc", "objc", ] @@ -1142,7 +1078,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "indexmap", "rustc-hash 2.1.1", @@ -1155,12 +1091,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" -[[package]] -name = "colorchoice" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" - [[package]] name = "combine" version = "4.6.7" @@ -1264,9 +1194,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" dependencies = [ "core-foundation-sys", "libc", @@ -1298,7 +1228,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ "bitflags 2.9.1", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-graphics-types 0.2.0", "foreign-types 0.5.0", "libc", @@ -1335,7 +1265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ "bitflags 2.9.1", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "libc", ] @@ -1348,7 +1278,7 @@ dependencies = [ "bitflags 2.9.1", "block", "cfg-if", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "libc", ] @@ -1358,7 +1288,7 @@ version = "21.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130" dependencies = [ - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-graphics 0.24.0", "foreign-types 0.5.0", "libc", @@ -1371,7 +1301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d45e71d5be22206bed53c3c3cb99315fc4c3d31b8963808c6bc4538168c4f8ef" dependencies = [ "block", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-graphics2", "io-surface", "libc", @@ -1495,16 +1425,6 @@ version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f211af61d8efdd104f96e57adf5e426ba1bc3ed7a4ead616e15e5881fd79c4d" -[[package]] -name = "ctrlc" -version = "3.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73" -dependencies = [ - "nix", - "windows-sys 0.59.0", -] - [[package]] name = "data-encoding" version = "2.9.0" @@ -1517,6 +1437,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" +[[package]] +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" + [[package]] name = "derive_more" version = "0.99.20" @@ -1533,11 +1459,11 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.101", "workspace-hack", ] @@ -1933,7 +1859,7 @@ source = "git+https://github.com/zed-industries/font-kit?rev=5474cfad4b719a72ec8 dependencies = [ "bitflags 2.9.1", "byteorder", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-graphics 0.24.0", "core-text", "dirs 5.0.1", @@ -2350,7 +2276,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2365,9 +2291,9 @@ dependencies = [ "calloop", "calloop-wayland-source", "cbindgen", - "cocoa 0.26.0", + "cocoa 0.26.1", "collections", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "core-graphics 0.24.0", "core-text", @@ -2442,11 +2368,12 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ + "heck 0.5.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.101", "workspace-hack", ] @@ -2555,9 +2482,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hermit-abi" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" +checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" [[package]] name = "hex" @@ -2670,7 +2597,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "anyhow", "bytes", @@ -2687,7 +2614,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "rustls", "rustls-platform-verifier", @@ -2722,11 +2649,10 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.5" +version = "0.27.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" +checksum = "03a01595e11bdcec50946522c32dde3fc6914743000a68b93000965f2f02406d" dependencies = [ - "futures-util", "http", "hyper", "hyper-util", @@ -2736,7 +2662,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 0.26.11", + "webpki-roots 1.0.0", ] [[package]] @@ -3006,15 +2932,14 @@ dependencies = [ [[package]] name = "io-surface" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8283575d5f0b2e7447ec0840363879d71c0fa325d4c699d5b45208ea4a51f45e" +checksum = "554b8c5d64ec09a3a520fe58e4d48a73e00ff32899cdcbe32a4877afd4968b8e" dependencies = [ "cgl", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "leaky-cow", - "libc", ] [[package]] @@ -3042,12 +2967,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - [[package]] name = "itertools" version = "0.12.1" @@ -3203,9 +3122,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c" +checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", "windows-targets 0.53.0", @@ -3396,11 +3315,11 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "anyhow", "bindgen 0.71.1", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-video", "ctor", "foreign-types 0.5.0", @@ -3488,13 +3407,13 @@ checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" [[package]] name = "mio" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3597,8 +3516,8 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "nostr" -version = "0.42.0" -source = "git+https://github.com/rust-nostr/nostr#9a720c78e799cf39a455186d9b94196178be021e" +version = "0.42.1" +source = "git+https://github.com/rust-nostr/nostr#50e48f8fe4624b57a5ee495c0df98020e5208736" dependencies = [ "aes", "base64", @@ -3623,7 +3542,7 @@ dependencies = [ [[package]] name = "nostr-connect" version = "0.42.0" -source = "git+https://github.com/rust-nostr/nostr#9a720c78e799cf39a455186d9b94196178be021e" +source = "git+https://github.com/rust-nostr/nostr#50e48f8fe4624b57a5ee495c0df98020e5208736" dependencies = [ "async-utility", "nostr", @@ -3635,7 +3554,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.42.0" -source = "git+https://github.com/rust-nostr/nostr#9a720c78e799cf39a455186d9b94196178be021e" +source = "git+https://github.com/rust-nostr/nostr#50e48f8fe4624b57a5ee495c0df98020e5208736" dependencies = [ "flatbuffers", "lru", @@ -3646,7 +3565,7 @@ dependencies = [ [[package]] name = "nostr-lmdb" version = "0.42.0" -source = "git+https://github.com/rust-nostr/nostr#9a720c78e799cf39a455186d9b94196178be021e" +source = "git+https://github.com/rust-nostr/nostr#50e48f8fe4624b57a5ee495c0df98020e5208736" dependencies = [ "async-utility", "heed", @@ -3659,7 +3578,7 @@ dependencies = [ [[package]] name = "nostr-relay-pool" version = "0.42.0" -source = "git+https://github.com/rust-nostr/nostr#9a720c78e799cf39a455186d9b94196178be021e" +source = "git+https://github.com/rust-nostr/nostr#50e48f8fe4624b57a5ee495c0df98020e5208736" dependencies = [ "async-utility", "async-wsocket", @@ -3675,7 +3594,7 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.42.0" -source = "git+https://github.com/rust-nostr/nostr#9a720c78e799cf39a455186d9b94196178be021e" +source = "git+https://github.com/rust-nostr/nostr#50e48f8fe4624b57a5ee495c0df98020e5208736" dependencies = [ "async-utility", "nostr", @@ -4158,9 +4077,9 @@ dependencies = [ [[package]] name = "pathfinder_simd" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2" +checksum = "bf9027960355bf3afff9841918474a81a5f972ac6d226d518060bba758b5ad57" dependencies = [ "rustc_version", ] @@ -4293,15 +4212,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.4" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" +checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi 0.4.0", + "hermit-abi 0.5.1", "pin-project-lite", - "rustix 0.38.44", + "rustix 1.0.7", "tracing", "windows-sys 0.59.0", ] @@ -4680,9 +4599,9 @@ dependencies = [ [[package]] name = "read-fonts" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce8e2ca6b24313587a03ca61bb74c384e2a815bd90cf2866cfc9f5fb7a11fa0" +checksum = "4e85935612710191461ec9df47b4b5880dd6359d4fad3b2f2ed696215f6f3146" dependencies = [ "bytemuck", "font-types", @@ -4711,7 +4630,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "derive_refineable", "workspace-hack", @@ -4850,7 +4769,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "anyhow", "bytes", @@ -5050,7 +4969,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" dependencies = [ - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "jni", "log", @@ -5085,9 +5004,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] name = "rustybuzz" @@ -5296,7 +5215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ "bitflags 2.9.1", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "libc", "security-framework-sys", @@ -5321,7 +5240,7 @@ checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "anyhow", "serde", @@ -5387,6 +5306,19 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_json_lenient" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e033097bf0d2b59a62b42c18ebbb797503839b26afdda2c4e1415cb6c813540" +dependencies = [ + "indexmap", + "itoa", + "memchr", + "ryu", + "serde", +] + [[package]] name = "serde_repr" version = "0.1.20" @@ -5503,9 +5435,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "skrifa" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe6666ab11018ab91ff7b03f1a3b9fdbecfb610848436fefa5ce50343d3d913" +checksum = "b9c3bb8cab5196b98d70c866ce1ea81ab516104d5b396f84ae80f8766b5d5b4e" dependencies = [ "bytemuck", "read-fonts", @@ -5560,9 +5492,9 @@ checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" [[package]] name = "socket2" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ "libc", "windows-sys 0.52.0", @@ -5607,12 +5539,6 @@ dependencies = [ "float-cmp", ] -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - [[package]] name = "strum" version = "0.26.3" @@ -5666,7 +5592,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "arrayvec", "log", @@ -5770,9 +5696,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dce3f0af95643c855cdc449fbaa17d8c2cd08e0b00a49a6babcbe6e71667f3d" +checksum = "f745de914febc7c9ab4388dfaf94bbc87e69f57bb41133a9b0c84d4be49856f3" dependencies = [ "skrifa", "yazi", @@ -6089,9 +6015,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.45.0" +version = "1.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165" +checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" dependencies = [ "backtrace", "bytes", @@ -6560,19 +6486,14 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#91bc5aefa4d238b069295cd5e913a2ea17aee43f" +source = "git+https://github.com/zed-industries/zed#2a8242ac909ff5572d1ff5bb3e33ecb9337b456c" dependencies = [ "anyhow", "async-fs", + "async_zip", "collections", "dirs 4.0.0", "dunce", @@ -6586,22 +6507,29 @@ dependencies = [ "rust-embed", "serde", "serde_json", + "serde_json_lenient", "smol", "take-until", + "tempfile", "tendril", "unicase", + "unicode-script", + "unicode-segmentation", + "walkdir", "workspace-hack", ] [[package]] name = "uuid" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" dependencies = [ "getrandom 0.3.3", + "js-sys", "serde", "sha1_smol", + "wasm-bindgen", ] [[package]] @@ -6936,7 +6864,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5df295f8451142f1856b1bd86a606dfe9587d439bc036e319c827700dbd555e" dependencies = [ - "core-foundation 0.10.0", + "core-foundation 0.10.1", "home", "jni", "log", @@ -6985,9 +6913,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" +checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3" [[package]] name = "which" @@ -7068,12 +6996,10 @@ dependencies = [ [[package]] name = "windows-capture" -version = "1.4.3" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d10b4be8b907c7055bc7270dd68d2b920978ffacc1599dcb563a79f0e68d16" +checksum = "757c9e7b920233fec91cb314ad92b96853ba2907e3482a193d290d33838e3fc5" dependencies = [ - "clap", - "ctrlc", "parking_lot", "rayon", "thiserror 2.0.12", diff --git a/crates/ui/src/context_menu.rs b/crates/ui/src/context_menu.rs index 546c8eb..e483bca 100644 --- a/crates/ui/src/context_menu.rs +++ b/crates/ui/src/context_menu.rs @@ -99,9 +99,14 @@ impl Element for ContextMenu { Some(self.id.clone()) } + fn source_location(&self) -> Option<&'static std::panic::Location<'static>> { + None + } + fn request_layout( &mut self, id: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, window: &mut Window, cx: &mut App, ) -> (gpui::LayoutId, Self::RequestLayoutState) { @@ -180,6 +185,7 @@ impl Element for ContextMenu { fn prepaint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: gpui::Bounds, request_layout: &mut Self::RequestLayoutState, window: &mut Window, @@ -193,6 +199,7 @@ impl Element for ContextMenu { fn paint( &mut self, id: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, bounds: gpui::Bounds, request_layout: &mut Self::RequestLayoutState, _: &mut Self::PrepaintState, diff --git a/crates/ui/src/dock_area/dock.rs b/crates/ui/src/dock_area/dock.rs index 9260e99..fa7b0a1 100644 --- a/crates/ui/src/dock_area/dock.rs +++ b/crates/ui/src/dock_area/dock.rs @@ -403,9 +403,14 @@ impl Element for DockElement { None } + fn source_location(&self) -> Option<&'static std::panic::Location<'static>> { + None + } + fn request_layout( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, window: &mut gpui::Window, cx: &mut App, ) -> (gpui::LayoutId, Self::RequestLayoutState) { @@ -415,6 +420,7 @@ impl Element for DockElement { fn prepaint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: gpui::Bounds, _: &mut Self::RequestLayoutState, _window: &mut Window, @@ -425,6 +431,7 @@ impl Element for DockElement { fn paint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: gpui::Bounds, _: &mut Self::RequestLayoutState, _: &mut Self::PrepaintState, diff --git a/crates/ui/src/input/element.rs b/crates/ui/src/input/element.rs index 365aed9..736c746 100644 --- a/crates/ui/src/input/element.rs +++ b/crates/ui/src/input/element.rs @@ -355,9 +355,14 @@ impl Element for TextElement { None } + fn source_location(&self) -> Option<&'static std::panic::Location<'static>> { + None + } + fn request_layout( &mut self, _id: Option<&GlobalElementId>, + _: Option<&gpui::InspectorElementId>, window: &mut Window, cx: &mut App, ) -> (LayoutId, Self::RequestLayoutState) { @@ -386,6 +391,7 @@ impl Element for TextElement { fn prepaint( &mut self, _id: Option<&GlobalElementId>, + _: Option<&gpui::InspectorElementId>, bounds: Bounds, _request_layout: &mut Self::RequestLayoutState, window: &mut Window, @@ -503,6 +509,7 @@ impl Element for TextElement { fn paint( &mut self, _id: Option<&GlobalElementId>, + _: Option<&gpui::InspectorElementId>, input_bounds: Bounds, _request_layout: &mut Self::RequestLayoutState, prepaint: &mut Self::PrepaintState, diff --git a/crates/ui/src/popover.rs b/crates/ui/src/popover.rs index 2be97b0..1ecf994 100644 --- a/crates/ui/src/popover.rs +++ b/crates/ui/src/popover.rs @@ -250,9 +250,14 @@ impl Element for Popover { Some(self.id.clone()) } + fn source_location(&self) -> Option<&'static std::panic::Location<'static>> { + None + } + fn request_layout( &mut self, id: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, window: &mut Window, cx: &mut App, ) -> (gpui::LayoutId, Self::RequestLayoutState) { @@ -351,6 +356,7 @@ impl Element for Popover { fn prepaint( &mut self, _id: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _bounds: gpui::Bounds, request_layout: &mut Self::RequestLayoutState, window: &mut Window, @@ -383,6 +389,7 @@ impl Element for Popover { fn paint( &mut self, id: Option<&GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _bounds: Bounds, request_layout: &mut Self::RequestLayoutState, prepaint: &mut Self::PrepaintState, diff --git a/crates/ui/src/resizable/panel.rs b/crates/ui/src/resizable/panel.rs index a2af924..2fa9016 100644 --- a/crates/ui/src/resizable/panel.rs +++ b/crates/ui/src/resizable/panel.rs @@ -477,9 +477,14 @@ impl Element for ResizePanelGroupElement { None } + fn source_location(&self) -> Option<&'static std::panic::Location<'static>> { + None + } + fn request_layout( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, window: &mut Window, cx: &mut App, ) -> (gpui::LayoutId, Self::RequestLayoutState) { @@ -489,6 +494,7 @@ impl Element for ResizePanelGroupElement { fn prepaint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: Bounds, _: &mut Self::RequestLayoutState, _window: &mut Window, @@ -499,6 +505,7 @@ impl Element for ResizePanelGroupElement { fn paint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: Bounds, _: &mut Self::RequestLayoutState, _: &mut Self::PrepaintState, diff --git a/crates/ui/src/scroll/scrollable.rs b/crates/ui/src/scroll/scrollable.rs index 2b263df..05920be 100644 --- a/crates/ui/src/scroll/scrollable.rs +++ b/crates/ui/src/scroll/scrollable.rs @@ -150,9 +150,14 @@ where Some(self.id.clone()) } + fn source_location(&self) -> Option<&'static std::panic::Location<'static>> { + None + } + fn request_layout( &mut self, id: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, window: &mut Window, cx: &mut App, ) -> (gpui::LayoutId, Self::RequestLayoutState) { @@ -220,6 +225,7 @@ where fn prepaint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: gpui::Bounds, element: &mut Self::RequestLayoutState, window: &mut Window, @@ -233,6 +239,7 @@ where fn paint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: gpui::Bounds, element: &mut Self::RequestLayoutState, _: &mut Self::PrepaintState, diff --git a/crates/ui/src/scroll/scrollable_mask.rs b/crates/ui/src/scroll/scrollable_mask.rs index a646c30..289829b 100644 --- a/crates/ui/src/scroll/scrollable_mask.rs +++ b/crates/ui/src/scroll/scrollable_mask.rs @@ -53,9 +53,14 @@ impl Element for ScrollableMask { None } + fn source_location(&self) -> Option<&'static std::panic::Location<'static>> { + None + } + fn request_layout( &mut self, _: Option<&GlobalElementId>, + _: Option<&gpui::InspectorElementId>, window: &mut Window, cx: &mut App, ) -> (LayoutId, Self::RequestLayoutState) { @@ -76,6 +81,7 @@ impl Element for ScrollableMask { fn prepaint( &mut self, _: Option<&GlobalElementId>, + _: Option<&gpui::InspectorElementId>, bounds: Bounds, _: &mut Self::RequestLayoutState, window: &mut Window, @@ -96,6 +102,7 @@ impl Element for ScrollableMask { fn paint( &mut self, _: Option<&GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: Bounds, _: &mut Self::RequestLayoutState, hitbox: &mut Self::PrepaintState, diff --git a/crates/ui/src/scroll/scrollbar.rs b/crates/ui/src/scroll/scrollbar.rs index 7c3c4a9..c267ca8 100644 --- a/crates/ui/src/scroll/scrollbar.rs +++ b/crates/ui/src/scroll/scrollbar.rs @@ -396,9 +396,14 @@ impl Element for Scrollbar { None } + fn source_location(&self) -> Option<&'static std::panic::Location<'static>> { + None + } + fn request_layout( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, window: &mut Window, cx: &mut App, ) -> (gpui::LayoutId, Self::RequestLayoutState) { @@ -419,6 +424,7 @@ impl Element for Scrollbar { fn prepaint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, bounds: Bounds, _: &mut Self::RequestLayoutState, window: &mut Window, @@ -589,6 +595,7 @@ impl Element for Scrollbar { fn paint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: Bounds, _: &mut Self::RequestLayoutState, prepaint: &mut Self::PrepaintState, diff --git a/crates/ui/src/switch.rs b/crates/ui/src/switch.rs index b63e599..15187a4 100644 --- a/crates/ui/src/switch.rs +++ b/crates/ui/src/switch.rs @@ -95,9 +95,14 @@ impl Element for Switch { Some(self.id.clone()) } + fn source_location(&self) -> Option<&'static std::panic::Location<'static>> { + None + } + fn request_layout( &mut self, global_id: Option<&GlobalElementId>, + _: Option<&gpui::InspectorElementId>, window: &mut Window, cx: &mut App, ) -> (LayoutId, Self::RequestLayoutState) { @@ -224,6 +229,7 @@ impl Element for Switch { fn prepaint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: gpui::Bounds, element: &mut Self::RequestLayoutState, window: &mut Window, @@ -235,6 +241,7 @@ impl Element for Switch { fn paint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: gpui::Bounds, element: &mut Self::RequestLayoutState, _: &mut Self::PrepaintState, diff --git a/crates/ui/src/title_bar.rs b/crates/ui/src/title_bar.rs index 5f17e1f..43b3f5b 100644 --- a/crates/ui/src/title_bar.rs +++ b/crates/ui/src/title_bar.rs @@ -11,10 +11,8 @@ use crate::{h_flex, Icon, IconName, InteractiveElementExt as _, Sizable as _}; const HEIGHT: Pixels = px(34.); const TITLE_BAR_HEIGHT: Pixels = px(34.); - #[cfg(target_os = "macos")] const TITLE_BAR_LEFT_PADDING: Pixels = px(80.); - #[cfg(not(target_os = "macos"))] const TITLE_BAR_LEFT_PADDING: Pixels = px(12.); @@ -300,9 +298,14 @@ impl Element for TitleBarElement { None } + fn source_location(&self) -> Option<&'static std::panic::Location<'static>> { + None + } + fn request_layout( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, window: &mut Window, cx: &mut App, ) -> (gpui::LayoutId, Self::RequestLayoutState) { @@ -324,6 +327,7 @@ impl Element for TitleBarElement { fn prepaint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, _: gpui::Bounds, _: &mut Self::RequestLayoutState, _window: &mut Window, @@ -334,6 +338,7 @@ impl Element for TitleBarElement { fn paint( &mut self, _: Option<&gpui::GlobalElementId>, + _: Option<&gpui::InspectorElementId>, bounds: gpui::Bounds, _: &mut Self::RequestLayoutState, _: &mut Self::PrepaintState, diff --git a/crates/ui/src/window_border.rs b/crates/ui/src/window_border.rs index f102f83..e03bcd9 100644 --- a/crates/ui/src/window_border.rs +++ b/crates/ui/src/window_border.rs @@ -7,10 +7,8 @@ use theme::ActiveTheme; pub(crate) const BORDER_SIZE: Pixels = Pixels(1.0); pub(crate) const BORDER_RADIUS: Pixels = Pixels(0.0); - #[cfg(not(target_os = "linux"))] pub(crate) const SHADOW_SIZE: Pixels = Pixels(0.0); - #[cfg(target_os = "linux")] pub(crate) const SHADOW_SIZE: Pixels = Pixels(12.0); @@ -150,7 +148,7 @@ impl RenderOnce for WindowBorder { .when(!tiling.left, |div| div.border_l(BORDER_SIZE)) .when(!tiling.right, |div| div.border_r(BORDER_SIZE)) .when(!tiling.is_tiled(), |div| { - div.shadow(smallvec::smallvec![gpui::BoxShadow { + div.shadow(vec![gpui::BoxShadow { color: Hsla { h: 0., s: 0.,