dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump gpui (#1336)

Browse source
This commit is contained in:
Floyd Wang 2025-10-08 11:20:06 +08:00
parent d47b9c15ed
commit 66851c55e4
7 changed files with 448 additions and 314 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

695
Cargo.lock generated
View file

@ -168,6 +168,9 @@ dependencies = [
"serde",
"serde_repr",
"url",
"wayland-backend",
"wayland-client",
"wayland-protocols 0.32.9",
"zbus",
]
@ -275,6 +278,21 @@ dependencies = [
"futures-lite 2.6.1",
]
[[package]]
name = "async-global-executor"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
dependencies = [
"async-channel 2.5.0",
"async-executor",
"async-io 2.5.0",
"async-lock 3.4.1",
"blocking",
"futures-lite 2.6.1",
"once_cell",
]
[[package]]
name = "async-io"
version = "1.13.0"
@ -419,6 +437,47 @@ dependencies = [
"windows-sys 0.60.2",
]
[[package]]
name = "async-std"
version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
dependencies = [
"async-channel 1.9.0",
"async-global-executor",
"async-io 2.5.0",
"async-lock 3.4.1",
"async-process 2.4.0",
"crossbeam-utils",
"futures-channel",
"futures-core",
"futures-io",
"futures-lite 2.6.1",
"gloo-timers",
"kv-log-macro",
"log",
"memchr",
"once_cell",
"pin-project-lite",
"pin-utils",
"slab",
"wasm-bindgen-futures",
]
[[package]]
name = "async-tar"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a42f905d4f623faf634bbd1e001e84e0efc24694afa64be9ad239bf6ca49e1f8"
dependencies = [
"async-std",
"filetime",
"libc",
"pin-project",
"redox_syscall 0.2.16",
"xattr",
]
[[package]]
name = "async-task"
version = "4.7.1"
@ -627,7 +686,7 @@ dependencies = [
"rustc-hash 1.1.0",
"shlex",
"syn 2.0.105",
"which",
"which 4.4.2",
]
[[package]]
@ -1160,16 +1219,6 @@ dependencies = [
"unicode-width",
]
[[package]]
name = "collections"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
dependencies = [
"indexmap",
"rustc-hash 2.1.1",
"workspace-hack",
]
[[package]]
name = "color-lsp"
version = "0.2.0"
@ -1622,17 +1671,6 @@ dependencies = [
"syn 2.0.105",
]
[[package]]
name = "derive_refineable"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.105",
"workspace-hack",
]
[[package]]
name = "deunicode"
version = "1.6.2"
@ -2155,30 +2193,6 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]]
name = "font-kit"
version = "0.14.1"
source = "git+https://github.com/zed-industries/font-kit?rev=5474cfad4b719a72ec8ed2cb7327b2b01fd10568#5474cfad4b719a72ec8ed2cb7327b2b01fd10568"
dependencies = [
"bitflags 2.9.1",
"byteorder",
"core-foundation 0.10.1",
"core-graphics 0.24.0",
"core-text",
"dirs 5.0.1",
"dwrote",
"float-ord",
"freetype-sys",
"lazy_static",
"libc",
"log",
"pathfinder_geometry",
"pathfinder_simd",
"walkdir",
"winapi",
"yeslogic-fontconfig-sys",
]
[[package]]
name = "font-types"
version = "0.9.0"
@ -2697,6 +2711,18 @@ dependencies = [
"walkdir",
]
[[package]]
name = "gloo-timers"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
dependencies = [
"futures-channel",
"futures-core",
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "glow"
version = "0.16.0"
@ -2753,7 +2779,7 @@ dependencies = [
[[package]]
name = "gpui"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"anyhow",
"as-raw-xcb-connection",
@ -2769,7 +2795,6 @@ dependencies = [
"calloop-wayland-source",
"cbindgen",
"cocoa 0.26.1",
"collections",
"core-foundation 0.10.1",
"core-foundation-sys",
"core-graphics 0.24.0",
@ -2782,18 +2807,15 @@ dependencies = [
"etagere",
"filedescriptor",
"flume",
"font-kit",
"foreign-types",
"futures",
"gpui_macros",
"http_client",
"gpui-macros",
"image",
"inventory",
"itertools 0.14.0",
"libc",
"log",
"lyon",
"media",
"metal",
"naga",
"num_cpus",
@ -2807,12 +2829,9 @@ dependencies = [
"profiling",
"rand 0.9.2",
"raw-window-handle",
"refineable",
"resvg",
"scap",
"schemars",
"seahash",
"semantic_version",
"serde",
"serde_json",
"slotmap",
@ -2820,18 +2839,15 @@ dependencies = [
"smol 2.0.2",
"stacksafe",
"strum 0.27.2",
"sum_tree",
"taffy",
"thiserror 2.0.14",
"usvg",
"util",
"util_macros",
"uuid",
"waker-fn",
"wayland-backend",
"wayland-client",
"wayland-cursor",
"wayland-protocols",
"wayland-protocols 0.31.2",
"wayland-protocols-plasma",
"windows 0.61.3",
"windows-core 0.61.2",
@ -2840,8 +2856,18 @@ dependencies = [
"workspace-hack",
"x11-clipboard",
"x11rb",
"xim",
"xkbcommon",
"zed-collections",
"zed-font-kit",
"zed-http-client",
"zed-media",
"zed-refineable",
"zed-scap",
"zed-semantic-version",
"zed-sum-tree",
"zed-util",
"zed-util-macros",
"zed-xim",
]
[[package]]
@ -2854,7 +2880,7 @@ dependencies = [
"enum-iterator",
"gpui",
"gpui-component-macros",
"gpui_macros",
"gpui-macros",
"html5ever 0.27.0",
"indoc",
"itertools 0.13.0",
@ -2875,7 +2901,6 @@ dependencies = [
"serde_repr",
"smallvec",
"smol 1.3.0",
"sum_tree",
"tracing",
"tree-sitter",
"tree-sitter-bash",
@ -2910,6 +2935,7 @@ dependencies = [
"unicode-segmentation",
"uuid",
"wry",
"zed-sum-tree",
]
[[package]]
@ -2922,9 +2948,9 @@ dependencies = [
]
[[package]]
name = "gpui_macros"
name = "gpui-macros"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@ -3188,30 +3214,10 @@ dependencies = [
"pin-project-lite",
]
[[package]]
name = "http_client"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
dependencies = [
"anyhow",
"bytes",
"derive_more",
"futures",
"http",
"http-body",
"log",
"parking_lot",
"reqwest",
"serde",
"serde_json",
"url",
"workspace-hack",
]
[[package]]
name = "http_client_tls"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"rustls",
"rustls-platform-verifier",
@ -3781,6 +3787,15 @@ dependencies = [
"smallvec",
]
[[package]]
name = "kv-log-macro"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
dependencies = [
"log",
]
[[package]]
name = "lazy_static"
version = "1.5.0"
@ -3857,7 +3872,7 @@ checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
dependencies = [
"bitflags 2.9.1",
"libc",
"redox_syscall",
"redox_syscall 0.5.17",
]
[[package]]
@ -4107,22 +4122,6 @@ dependencies = [
"digest",
]
[[package]]
name = "media"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
dependencies = [
"anyhow",
"bindgen 0.71.1",
"core-foundation 0.10.1",
"core-video",
"ctor",
"foreign-types",
"metal",
"objc",
"workspace-hack",
]
[[package]]
name = "memchr"
version = "2.7.5"
@ -4514,7 +4513,7 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
dependencies = [
"proc-macro-crate 3.3.0",
"proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
"syn 2.0.105",
@ -4815,7 +4814,7 @@ checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"redox_syscall 0.5.17",
"smallvec",
"windows-targets 0.52.6",
]
@ -4867,17 +4866,6 @@ version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "perf"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
dependencies = [
"collections",
"serde",
"serde_json",
"workspace-hack",
]
[[package]]
name = "pest"
version = "2.8.1"
@ -5649,6 +5637,15 @@ dependencies = [
"font-types",
]
[[package]]
name = "redox_syscall"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
"bitflags 1.3.2",
]
[[package]]
name = "redox_syscall"
version = "0.5.17"
@ -5700,15 +5697,6 @@ dependencies = [
"syn 2.0.105",
]
[[package]]
name = "refineable"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
dependencies = [
"derive_refineable",
"workspace-hack",
]
[[package]]
name = "regex"
version = "1.11.1"
@ -5762,71 +5750,22 @@ dependencies = [
"bytecheck",
]
[[package]]
name = "reqwest"
version = "0.12.15"
source = "git+https://github.com/zed-industries/reqwest.git?rev=951c770a32f1998d6e999cef3e59e0013e6c4415#951c770a32f1998d6e999cef3e59e0013e6c4415"
dependencies = [
"base64",
"bytes",
"encoding_rs",
"futures-core",
"futures-util",
"h2",
"http",
"http-body",
"http-body-util",
"hyper",
"hyper-rustls",
"hyper-util",
"ipnet",
"js-sys",
"log",
"mime",
"mime_guess",
"once_cell",
"percent-encoding",
"pin-project-lite",
"quinn",
"rustls",
"rustls-native-certs",
"rustls-pemfile",
"rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"system-configuration",
"tokio",
"tokio-rustls",
"tokio-socks",
"tokio-util",
"tower 0.5.2",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-streams",
"web-sys",
"windows-registry 0.4.0",
]
[[package]]
name = "reqwest_client"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"anyhow",
"bytes",
"futures",
"http_client",
"http_client_tls",
"log",
"regex",
"reqwest",
"serde",
"tokio",
"workspace-hack",
"zed-http-client",
"zed-reqwest",
]
[[package]]
@ -6225,27 +6164,6 @@ dependencies = [
"winapi-util",
]
[[package]]
name = "scap"
version = "0.0.8"
source = "git+https://github.com/zed-industries/scap?rev=808aa5c45b41e8f44729d02e38fd00a2fe2722e7#808aa5c45b41e8f44729d02e38fd00a2fe2722e7"
dependencies = [
"anyhow",
"cocoa 0.25.0",
"core-graphics-helmer-fork",
"log",
"objc",
"rand 0.8.5",
"screencapturekit",
"screencapturekit-sys",
"sysinfo",
"tao-core-video-sys",
"windows 0.61.3",
"windows-capture",
"x11",
"xcb",
]
[[package]]
name = "schannel"
version = "0.1.27"
@ -6369,16 +6287,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
[[package]]
name = "semantic_version"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
dependencies = [
"anyhow",
"serde",
"workspace-hack",
]
[[package]]
name = "semver"
version = "1.0.26"
@ -6932,17 +6840,6 @@ version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "sum_tree"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
dependencies = [
"arrayvec",
"log",
"rayon",
"workspace-hack",
]
[[package]]
name = "sval"
version = "2.14.1"
@ -8226,52 +8123,6 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
[[package]]
name = "util"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
dependencies = [
"anyhow",
"async-fs 2.1.3",
"async_zip",
"collections",
"command-fds",
"dirs 4.0.0",
"dunce",
"futures",
"futures-lite 1.13.0",
"globset",
"itertools 0.14.0",
"libc",
"log",
"nix 0.29.0",
"regex",
"rust-embed",
"schemars",
"serde",
"serde_json",
"serde_json_lenient",
"shlex",
"smol 2.0.2",
"take-until",
"tempfile",
"tendril",
"unicase",
"walkdir",
"workspace-hack",
]
[[package]]
name = "util_macros"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#e4f90b5da2b8a6d2b267edc02b333b7d7908d4d9"
dependencies = [
"perf",
"quote",
"syn 2.0.105",
"workspace-hack",
]
[[package]]
name = "uuid"
version = "1.18.0"
@ -8549,6 +8400,18 @@ dependencies = [
"wayland-scanner",
]
[[package]]
name = "wayland-protocols"
version = "0.32.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
dependencies = [
"bitflags 2.9.1",
"wayland-backend",
"wayland-client",
"wayland-scanner",
]
[[package]]
name = "wayland-protocols-plasma"
version = "0.2.0"
@ -8558,7 +8421,7 @@ dependencies = [
"bitflags 2.9.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-protocols 0.31.2",
"wayland-scanner",
]
@ -8721,6 +8584,18 @@ dependencies = [
"rustix 0.38.44",
]
[[package]]
name = "which"
version = "6.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
dependencies = [
"either",
"home",
"rustix 0.38.44",
"winsafe",
]
[[package]]
name = "winapi"
version = "0.3.9"
@ -9285,6 +9160,12 @@ dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "winsafe"
version = "0.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
[[package]]
name = "wio"
version = "0.2.2"
@ -9419,6 +9300,15 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
[[package]]
name = "xattr"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
dependencies = [
"libc",
]
[[package]]
name = "xcb"
version = "1.5.0"
@ -9437,23 +9327,10 @@ version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b"
[[package]]
name = "xim"
version = "0.4.0"
source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d"
dependencies = [
"ahash 0.8.12",
"hashbrown 0.14.5",
"log",
"x11rb",
"xim-ctext",
"xim-parser",
]
[[package]]
name = "xim-ctext"
version = "0.3.0"
source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d"
source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
dependencies = [
"encoding_rs",
]
@ -9461,7 +9338,7 @@ dependencies = [
[[package]]
name = "xim-parser"
version = "0.2.1"
source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d"
source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
dependencies = [
"bitflags 2.9.1",
]
@ -9602,6 +9479,264 @@ dependencies = [
"zvariant",
]
[[package]]
name = "zed-collections"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"indexmap",
"rustc-hash 2.1.1",
"workspace-hack",
]
[[package]]
name = "zed-derive-refineable"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.105",
"workspace-hack",
]
[[package]]
name = "zed-font-kit"
version = "0.14.1-zed"
source = "git+https://github.com/zed-industries/font-kit?rev=110523127440aefb11ce0cf280ae7c5071337ec5#110523127440aefb11ce0cf280ae7c5071337ec5"
dependencies = [
"bitflags 2.9.1",
"byteorder",
"core-foundation 0.10.1",
"core-graphics 0.24.0",
"core-text",
"dirs 5.0.1",
"dwrote",
"float-ord",
"freetype-sys",
"lazy_static",
"libc",
"log",
"pathfinder_geometry",
"pathfinder_simd",
"walkdir",
"winapi",
"yeslogic-fontconfig-sys",
]
[[package]]
name = "zed-http-client"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"anyhow",
"async-compression",
"async-fs 2.1.3",
"async-tar",
"bytes",
"derive_more",
"futures",
"http",
"http-body",
"log",
"parking_lot",
"serde",
"serde_json",
"sha2",
"tempfile",
"url",
"workspace-hack",
"zed-reqwest",
"zed-util",
]
[[package]]
name = "zed-media"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"anyhow",
"bindgen 0.71.1",
"core-foundation 0.10.1",
"core-video",
"ctor",
"foreign-types",
"metal",
"objc",
"workspace-hack",
]
[[package]]
name = "zed-perf"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"serde",
"serde_json",
"workspace-hack",
"zed-collections",
]
[[package]]
name = "zed-refineable"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"workspace-hack",
"zed-derive-refineable",
]
[[package]]
name = "zed-reqwest"
version = "0.12.15-zed"
source = "git+https://github.com/zed-industries/reqwest.git?rev=c15662463bda39148ba154100dd44d3fba5873a4#c15662463bda39148ba154100dd44d3fba5873a4"
dependencies = [
"base64",
"bytes",
"encoding_rs",
"futures-core",
"futures-util",
"h2",
"http",
"http-body",
"http-body-util",
"hyper",
"hyper-rustls",
"hyper-util",
"ipnet",
"js-sys",
"log",
"mime",
"mime_guess",
"once_cell",
"percent-encoding",
"pin-project-lite",
"quinn",
"rustls",
"rustls-native-certs",
"rustls-pemfile",
"rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"system-configuration",
"tokio",
"tokio-rustls",
"tokio-socks",
"tokio-util",
"tower 0.5.2",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-streams",
"web-sys",
"windows-registry 0.4.0",
]
[[package]]
name = "zed-scap"
version = "0.0.8-zed"
source = "git+https://github.com/zed-industries/scap?rev=4afea48c3b002197176fb19cd0f9b180dd36eaac#4afea48c3b002197176fb19cd0f9b180dd36eaac"
dependencies = [
"anyhow",
"cocoa 0.25.0",
"core-graphics-helmer-fork",
"log",
"objc",
"rand 0.8.5",
"screencapturekit",
"screencapturekit-sys",
"sysinfo",
"tao-core-video-sys",
"windows 0.61.3",
"windows-capture",
"x11",
"xcb",
]
[[package]]
name = "zed-semantic-version"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"anyhow",
"serde",
"workspace-hack",
]
[[package]]
name = "zed-sum-tree"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"arrayvec",
"log",
"rayon",
"workspace-hack",
]
[[package]]
name = "zed-util"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"anyhow",
"async-fs 2.1.3",
"async_zip",
"command-fds",
"dirs 4.0.0",
"dunce",
"futures",
"futures-lite 1.13.0",
"globset",
"itertools 0.14.0",
"libc",
"log",
"nix 0.29.0",
"regex",
"rust-embed",
"schemars",
"serde",
"serde_json",
"serde_json_lenient",
"shlex",
"smol 2.0.2",
"take-until",
"tempfile",
"tendril",
"unicase",
"walkdir",
"which 6.0.3",
"workspace-hack",
"zed-collections",
]
[[package]]
name = "zed-util-macros"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed.git#5c7907ad2fb566c787de003e79cfb7ba40364ac2"
dependencies = [
"quote",
"syn 2.0.105",
"workspace-hack",
"zed-perf",
]
[[package]]
name = "zed-xim"
version = "0.4.0-zed"
source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
dependencies = [
"ahash 0.8.12",
"hashbrown 0.14.5",
"log",
"x11rb",
"xim-ctext",
"xim-parser",
]
[[package]]
name = "zeno"
version = "0.3.3"

39
Cargo.toml
View file

@ -1,37 +1,36 @@
[workspace]
members = [
"crates/macros",
"crates/hello_world",
"crates/story",
"crates/ui",
]
members = ["crates/hello_world", "crates/macros", "crates/story", "crates/ui"]
default-members = ["crates/story"]
resolver = "2"
[workspace.dependencies]
gpui = { git = "https://github.com/zed-industries/zed.git" }
gpui_macros = { git = "https://github.com/zed-industries/zed.git" }
reqwest_client = { git = "https://github.com/zed-industries/zed.git" }
sum_tree = { git = "https://github.com/zed-industries/zed.git" }
gpui-component = { path = "crates/ui" }
gpui-component-macros = { path = "crates/macros" }
story = { path = "crates/story" }
ropey = { version = "=2.0.0-beta.1", features = ["metric_utf16", "metric_lines_lf"] }
gpui = { git = "https://github.com/zed-industries/zed.git" }
gpui-macros = { git = "https://github.com/zed-industries/zed.git" }
reqwest_client = { git = "https://github.com/zed-industries/zed.git" }
zed-sum-tree = { git = "https://github.com/zed-industries/zed.git" }
anyhow = "1"
log = "0.4"
serde = { version = "1.0.219", features = ["derive"] }
serde_repr = "0.1"
serde_json = "1"
schemars = "1"
smallvec = "1"
rust-i18n = "3"
lsp-types = "0.97.0"
notify = "7.0.0"
raw-window-handle = "0.6.2"
ropey = { version = "=2.0.0-beta.1", features = [
"metric_lines_lf",
"metric_utf16",
] }
rust-i18n = "3"
schemars = "1"
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1"
serde_repr = "0.1"
smallvec = "1"
smol = "1"
tracing = "0.1.41"
notify = "7.0.0"
lsp-types = "0.97.0"
[workspace.dependencies.windows]
features = ["Wdk", "Wdk_System", "Wdk_System_SystemServices"]
@ -43,6 +42,7 @@ arc_with_non_send_sync = "allow"
borrowed_box = "allow"
dbg_macro = "deny"
let_underscore_future = "allow"
manual_is_multiple_of = "allow"
map_entry = "allow"
module_inception = "allow"
non_canonical_partial_ord_impl = "allow"
@ -51,7 +51,6 @@ single_range_in_vec_init = "allow"
style = { level = "allow", priority = -1 }
todo = "deny"
type_complexity = "allow"
manual_is_multiple_of = "allow"
[profile.dev]
codegen-units = 16

4
crates/ui/Cargo.toml
View file

@ -51,7 +51,7 @@ tree-sitter-languages = [
anyhow.workspace = true
gpui = { workspace = true }
gpui-component-macros.workspace = true
gpui_macros.workspace = true
gpui-macros.workspace = true
notify.workspace = true
ropey.workspace = true
rust-i18n.workspace = true
@ -61,8 +61,8 @@ serde_json.workspace = true
serde_repr.workspace = true
smallvec.workspace = true
smol.workspace = true
sum_tree.workspace = true
tracing.workspace = true
zed-sum-tree.workspace = true
enum-iterator = "2.1.0"
itertools = "0.13.0"

6
crates/ui/src/highlighter/diagnostics.rs
View file

@ -6,7 +6,7 @@ use std::{
use gpui::{px, App, HighlightStyle, Hsla, SharedString, UnderlineStyle};
use ropey::Rope;
use sum_tree::{Bias, SeekTarget, SumTree};
use zed_sum_tree::{Bias, SeekTarget, SumTree};
use crate::{
input::{Position, RopeExt as _},
@ -199,7 +199,7 @@ pub struct DiagnosticSummary {
end: usize,
}
impl sum_tree::Item for DiagnosticEntry {
impl zed_sum_tree::Item for DiagnosticEntry {
type Summary = DiagnosticSummary;
fn summary(&self, _cx: &()) -> Self::Summary {
DiagnosticSummary {
@ -210,7 +210,7 @@ impl sum_tree::Item for DiagnosticEntry {
}
}
impl sum_tree::Summary for DiagnosticSummary {
impl zed_sum_tree::Summary for DiagnosticSummary {
type Context<'a> = &'a ();
fn zero(_: Self::Context<'_>) -> Self {
DiagnosticSummary {

10
crates/ui/src/highlighter/highlighter.rs
View file

@ -10,10 +10,10 @@ use std::{
ops::Range,
usize,
};
use sum_tree::Bias;
use tree_sitter::{
InputEdit, Node, Parser, Point, Query, QueryCursor, QueryMatch, StreamingIterator, Tree,
};
use zed_sum_tree::Bias;
/// A syntax highlighter that supports incremental parsing, multiline text,
/// and caching of highlight results.
@ -102,7 +102,7 @@ impl HighlightItem {
}
}
impl sum_tree::Item for HighlightItem {
impl zed_sum_tree::Item for HighlightItem {
type Summary = HighlightSummary;
fn summary(&self, _cx: &()) -> Self::Summary {
HighlightSummary {
@ -115,7 +115,7 @@ impl sum_tree::Item for HighlightItem {
}
}
impl sum_tree::Summary for HighlightSummary {
impl zed_sum_tree::Summary for HighlightSummary {
type Context<'a> = &'a ();
fn zero(_: Self::Context<'_>) -> Self {
HighlightSummary {
@ -136,7 +136,7 @@ impl sum_tree::Summary for HighlightSummary {
}
}
impl<'a> sum_tree::Dimension<'a, HighlightSummary> for usize {
impl<'a> zed_sum_tree::Dimension<'a, HighlightSummary> for usize {
fn zero(_: &()) -> Self {
0
}
@ -144,7 +144,7 @@ impl<'a> sum_tree::Dimension<'a, HighlightSummary> for usize {
fn add_summary(&mut self, _: &'a HighlightSummary, _: &()) {}
}
impl<'a> sum_tree::Dimension<'a, HighlightSummary> for Range<usize> {
impl<'a> zed_sum_tree::Dimension<'a, HighlightSummary> for Range<usize> {
fn zero(_: &()) -> Self {
Default::default()
}

6
crates/ui/src/input/rope_ext.rs
View file

@ -1,8 +1,8 @@
use std::ops::Range;
use ropey::{LineType, Rope, RopeSlice};
use sum_tree::Bias;
use tree_sitter::Point;
use zed_sum_tree::Bias;
use crate::input::Position;
@ -208,7 +208,7 @@ pub trait RopeExt {
///
/// ```
/// use gpui_component::input::{Rope, RopeExt};
/// use sum_tree::Bias;
/// use zed_sum_tree::Bias;
///
/// let rope = Rope::from("Hello 中文🎉 test\nRope");
/// assert_eq!(rope.clip_offset(5, Bias::Left), 5);
@ -393,8 +393,8 @@ impl RopeExt for Rope {
#[cfg(test)]
mod tests {
use ropey::Rope;
use sum_tree::Bias;
use tree_sitter::Point;
use zed_sum_tree::Bias;
use crate::input::{Position, RopeExt};

2
crates/ui/src/input/state.rs
View file

@ -15,8 +15,8 @@ use serde::Deserialize;
use std::cell::RefCell;
use std::ops::Range;
use std::rc::Rc;
use sum_tree::Bias;
use unicode_segmentation::*;
use zed_sum_tree::Bias;
use super::{
blink_cursor::BlinkCursor,