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

chore: Update GPUI 2025/01/14 (#547)

Browse source
This commit is contained in:
Jason Lee 2025-01-14 19:21:04 +08:00 committed by GitHub
parent 7848311046
commit a0f6b48eff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 84 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
Cargo.lock generated
View file

@ -474,13 +474,13 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.13.0", "itertools 0.11.0",
"log", "log",
"prettyplease", "prettyplease",
"proc-macro2", "proc-macro2",
"quote", "quote",
"regex", "regex",
"rustc-hash", "rustc-hash 1.1.0",
"shlex", "shlex",
"syn 2.0.95", "syn 2.0.95",
] ]
@ -750,7 +750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb"
dependencies = [ dependencies = [
"heck 0.4.1", "heck 0.4.1",
"indexmap 2.6.0", "indexmap 2.7.0",
"log", "log",
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -952,9 +952,10 @@ dependencies = [
[[package]] [[package]]
name = "collections" name = "collections"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#c7371557a03965b6c421b7bdb58f484f7eff5ace"
dependencies = [ dependencies = [
"rustc-hash", "indexmap 2.7.0",
"rustc-hash 2.1.0",
] ]
[[package]] [[package]]
@ -1123,7 +1124,7 @@ dependencies = [
"log", "log",
"rangemap", "rangemap",
"rayon", "rayon",
"rustc-hash", "rustc-hash 1.1.0",
"rustybuzz 0.14.1", "rustybuzz 0.14.1",
"self_cell", "self_cell",
"swash", "swash",
@ -1315,7 +1316,7 @@ dependencies = [
[[package]] [[package]]
name = "derive_refineable" name = "derive_refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#c7371557a03965b6c421b7bdb58f484f7eff5ace"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2268,7 +2269,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui" name = "gpui"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#c7371557a03965b6c421b7bdb58f484f7eff5ace"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"as-raw-xcb-connection", "as-raw-xcb-connection",
@ -2302,7 +2303,7 @@ dependencies = [
"gpui_macros", "gpui_macros",
"http_client", "http_client",
"image", "image",
"itertools 0.13.0", "itertools 0.14.0",
"linkme", "linkme",
"log", "log",
"media", "media",
@ -2328,7 +2329,7 @@ dependencies = [
"serde_json", "serde_json",
"slotmap", "slotmap",
"smallvec", "smallvec",
"smol", "smol 2.0.2",
"strum", "strum",
"sum_tree", "sum_tree",
"taffy", "taffy",
@ -2353,7 +2354,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_macros" name = "gpui_macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#c7371557a03965b6c421b7bdb58f484f7eff5ace"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2543,7 +2544,7 @@ dependencies = [
[[package]] [[package]]
name = "http_client" name = "http_client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#c7371557a03965b6c421b7bdb58f484f7eff5ace"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -2668,12 +2669,13 @@ dependencies = [
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "2.6.0" version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
dependencies = [ dependencies = [
"equivalent", "equivalent",
"hashbrown 0.15.0", "hashbrown 0.15.0",
"serde",
] ]
[[package]] [[package]]
@ -2763,6 +2765,15 @@ dependencies = [
"either", "either",
] ]
[[package]]
name = "itertools"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
dependencies = [
"either",
]
[[package]] [[package]]
name = "itoa" name = "itoa"
version = "0.4.8" version = "0.4.8"
@ -3059,7 +3070,7 @@ dependencies = [
[[package]] [[package]]
name = "media" name = "media"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#c7371557a03965b6c421b7bdb58f484f7eff5ace"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bindgen", "bindgen",
@ -3143,9 +3154,9 @@ dependencies = [
"cfg_aliases 0.1.1", "cfg_aliases 0.1.1",
"codespan-reporting", "codespan-reporting",
"hexf-parse", "hexf-parse",
"indexmap 2.6.0", "indexmap 2.7.0",
"log", "log",
"rustc-hash", "rustc-hash 1.1.0",
"spirv", "spirv",
"termcolor", "termcolor",
"thiserror 1.0.66", "thiserror 1.0.66",
@ -3368,7 +3379,7 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
dependencies = [ dependencies = [
"proc-macro-crate 3.2.0", "proc-macro-crate 1.3.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.95", "syn 2.0.95",
@ -3610,8 +3621,7 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]] [[package]]
name = "oo7" name = "oo7"
version = "0.3.3" version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/zed-industries/oo7?branch=avoid-crypto-panic#9d5d5fcd7e4e0add9b420ffb58f67661b0b37568"
checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24"
dependencies = [ dependencies = [
"aes", "aes",
"async-fs 2.1.2", "async-fs 2.1.2",
@ -4339,7 +4349,7 @@ dependencies = [
[[package]] [[package]]
name = "refineable" name = "refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#c7371557a03965b6c421b7bdb58f484f7eff5ace"
dependencies = [ dependencies = [
"derive_refineable", "derive_refineable",
] ]
@ -4497,6 +4507,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc-hash"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
[[package]] [[package]]
name = "rustc_version" name = "rustc_version"
version = "0.4.1" version = "0.4.1"
@ -4596,6 +4612,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
dependencies = [ dependencies = [
"dyn-clone", "dyn-clone",
"indexmap 2.7.0",
"schemars_derive", "schemars_derive",
"serde", "serde",
"serde_json", "serde_json",
@ -4660,7 +4677,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
[[package]] [[package]]
name = "semantic_version" name = "semantic_version"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#c7371557a03965b6c421b7bdb58f484f7eff5ace"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -4718,7 +4735,7 @@ version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [ dependencies = [
"indexmap 2.6.0", "indexmap 2.7.0",
"itoa 1.0.11", "itoa 1.0.11",
"memchr", "memchr",
"ryu", "ryu",
@ -4751,7 +4768,7 @@ version = "0.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48e76bab63c3fd98d27c17f9cbce177f64a91f5e69ac04cafe04e1bb25d1dc3c" checksum = "48e76bab63c3fd98d27c17f9cbce177f64a91f5e69ac04cafe04e1bb25d1dc3c"
dependencies = [ dependencies = [
"indexmap 2.6.0", "indexmap 2.7.0",
"itoa 1.0.11", "itoa 1.0.11",
"libyml", "libyml",
"log", "log",
@ -4902,6 +4919,23 @@ dependencies = [
"futures-lite 1.13.0", "futures-lite 1.13.0",
] ]
[[package]]
name = "smol"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f"
dependencies = [
"async-channel 2.3.1",
"async-executor",
"async-fs 2.1.2",
"async-io 2.3.4",
"async-lock 3.4.0",
"async-net 2.0.0",
"async-process 2.3.0",
"blocking",
"futures-lite 2.4.0",
]
[[package]] [[package]]
name = "snafu" name = "snafu"
version = "0.8.5" version = "0.8.5"
@ -5044,20 +5078,20 @@ dependencies = [
[[package]] [[package]]
name = "strum" name = "strum"
version = "0.25.0" version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
dependencies = [ dependencies = [
"strum_macros", "strum_macros",
] ]
[[package]] [[package]]
name = "strum_macros" name = "strum_macros"
version = "0.25.3" version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
dependencies = [ dependencies = [
"heck 0.4.1", "heck 0.5.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"rustversion", "rustversion",
@ -5082,7 +5116,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]] [[package]]
name = "sum_tree" name = "sum_tree"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#c7371557a03965b6c421b7bdb58f484f7eff5ace"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"log", "log",
@ -5484,7 +5518,7 @@ version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [ dependencies = [
"indexmap 2.6.0", "indexmap 2.7.0",
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
@ -5497,7 +5531,7 @@ version = "0.20.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
dependencies = [ dependencies = [
"indexmap 2.6.0", "indexmap 2.7.0",
"toml_datetime", "toml_datetime",
"winnow 0.5.40", "winnow 0.5.40",
] ]
@ -5508,7 +5542,7 @@ version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [ dependencies = [
"indexmap 2.6.0", "indexmap 2.7.0",
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
@ -5613,7 +5647,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"smallvec", "smallvec",
"smol", "smol 1.3.0",
"unicode-segmentation", "unicode-segmentation",
"usvg", "usvg",
"uuid", "uuid",
@ -5767,24 +5801,24 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]] [[package]]
name = "util" name = "util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#c7371557a03965b6c421b7bdb58f484f7eff5ace"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-fs 1.6.0", "async-fs 2.1.2",
"collections", "collections",
"dirs 4.0.0", "dirs 4.0.0",
"dunce", "dunce",
"futures", "futures",
"futures-lite 1.13.0", "futures-lite 1.13.0",
"globset", "globset",
"itertools 0.13.0", "itertools 0.14.0",
"libc", "libc",
"log", "log",
"regex", "regex",
"rust-embed", "rust-embed",
"serde", "serde",
"serde_json", "serde_json",
"smol", "smol 2.0.2",
"take-until", "take-until",
"tendril", "tendril",
"unicase", "unicase",

2
crates/story/src/main.rs
View file

@ -40,7 +40,7 @@ struct AddPanel(DockPlacement);
#[derive(Clone, PartialEq, Eq, Deserialize)] #[derive(Clone, PartialEq, Eq, Deserialize)]
struct TogglePanelVisible(SharedString); struct TogglePanelVisible(SharedString);
impl_actions!( impl_internal_actions!(
story, story,
[ [
SelectLocale, SelectLocale,

10
crates/story/src/popup_story.rs
View file

@ -1,8 +1,8 @@
use gpui::{ use gpui::{
actions, div, impl_actions, px, AppContext, Corner, DismissEvent, Element, EventEmitter, actions, div, impl_internal_actions, px, AppContext, Corner, DismissEvent, Element,
FocusHandle, FocusableView, InteractiveElement, IntoElement, KeyBinding, MouseButton, EventEmitter, FocusHandle, FocusableView, InteractiveElement, IntoElement, KeyBinding,
ParentElement as _, Render, SharedString, Styled as _, View, ViewContext, VisualContext, MouseButton, ParentElement as _, Render, SharedString, Styled as _, View, ViewContext,
WindowContext, VisualContext, WindowContext,
}; };
use serde::Deserialize; use serde::Deserialize;
use ui::{ use ui::{
@ -25,7 +25,7 @@ actions!(
popover_story, popover_story,
[Copy, Paste, Cut, SearchAll, ToggleWindowMode] [Copy, Paste, Cut, SearchAll, ToggleWindowMode]
); );
impl_actions!(popover_story, [Info]); impl_internal_actions!(popover_story, [Info]);
pub fn init(cx: &mut AppContext) { pub fn init(cx: &mut AppContext) {
cx.bind_keys([ cx.bind_keys([

6
crates/story/src/sidebar_story.rs
View file

@ -1,6 +1,6 @@
use gpui::{ use gpui::{
div, impl_actions, relative, ClickEvent, ParentElement, Render, SharedString, Styled, View, div, impl_internal_actions, relative, ClickEvent, ParentElement, Render, SharedString, Styled,
ViewContext, VisualContext as _, WindowContext, View, ViewContext, VisualContext as _, WindowContext,
}; };
use serde::Deserialize; use serde::Deserialize;
@ -20,7 +20,7 @@ use ui::{
#[derive(Clone, PartialEq, Eq, Deserialize)] #[derive(Clone, PartialEq, Eq, Deserialize)]
pub struct SelectCompany(SharedString); pub struct SelectCompany(SharedString);
impl_actions!(sidebar_story, [SelectCompany]); impl_internal_actions!(sidebar_story, [SelectCompany]);
pub struct SidebarStory { pub struct SidebarStory {
active_item: Item, active_item: Item,

4
crates/story/src/table_story.rs
View file

@ -5,7 +5,7 @@ use std::{
use fake::{Fake, Faker}; use fake::{Fake, Faker};
use gpui::{ use gpui::{
div, impl_actions, px, AnyElement, AppContext, Edges, InteractiveElement, IntoElement, div, impl_internal_actions, px, AnyElement, AppContext, Edges, InteractiveElement, IntoElement,
ParentElement, Pixels, Render, SharedString, Styled, Timer, View, ViewContext, ParentElement, Pixels, Render, SharedString, Styled, Timer, View, ViewContext,
VisualContext as _, WindowContext, VisualContext as _, WindowContext,
}; };
@ -30,7 +30,7 @@ struct ChangeSize(Size);
#[derive(Clone, PartialEq, Eq, Deserialize)] #[derive(Clone, PartialEq, Eq, Deserialize)]
struct OpenDetail(usize); struct OpenDetail(usize);
impl_actions!(table_story, [ChangeSize, OpenDetail]); impl_internal_actions!(table_story, [ChangeSize, OpenDetail]);
#[derive(Clone, Debug, Default)] #[derive(Clone, Debug, Default)]
struct Stock { struct Stock {

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

@ -419,7 +419,7 @@ impl Element for TextElement {
let lines = cx let lines = cx
.text_system() .text_system()
.shape_text(display_text, font_size, &runs, wrap_width) .shape_text(display_text, font_size, &runs, wrap_width, None)
.unwrap(); .unwrap();
// `position_for_index` for example // `position_for_index` for example