ZacharyZhang-NY/Ely-GPUI-Components
1
1 Fork 0
Code Issues Pull Requests Actions 12 Packages Projects Releases Wiki Activity

Port · Build: Zed's gpui at 1a28cff

Browse Source 
gpui and gpui_platform now come from Zed's repo by git at 1a28cff,
the code gpui-pre 0.3.7 republishes, so the gallery can later build
for the browser. gpui takes stacker, as 0.2.2 always did, and
gpui_platform takes font-kit, without which macOS draws no text;
runtime_shaders moves to gpui_platform.

The API moved: focus, blur and Tab steps take cx, Corner is Anchor,
shaped lines paint with an alignment, defer_draw takes a content
mask, the inspector registers a factory, async updates return their
value, and wrapped lines are shared, not cloned. Updates through a
window context go through the window, so a closed window still ends
them as it did.

Where the new gpui behaves differently, Ely keeps its old intent.
Holds and reveals under a resting pointer survive typing through
gpui's input-modality-independent hover; previews the keyboard also
moves keep the default, and the calendar's leave ignores a key press.
Enter reaches a button inside the code editor, since gpui now arms a
key click on the press. The event logger skips a lone modifier. A
video and an image grid keep their shape in a flex column under
taffy 0.13, as a picture does.

AGENTS.md records the new stack and the rules this port changes; the
rest of the old gpui and taffy rules are re-tested in T44c.
This commit is contained in:
ZacharyZhang-NY committed 2026-09-28 20:30:17 -04:00
1 parent 25b8a6f22c
commit 4c3ed1bbb9
199 files changed
+2513 -2643
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/agent/tests/changes.rs
+46 -39
View File
@@ -40,24 +40,29 @@ struct Card {
impl Render for Card {
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let (view, height) = (cx.entity(), self.height.clone());
div()
.relative()
.w(px(640.0))
.child(
FileChangeCard::new("card", change("src/theme/lift.rs")).on_decide(
move |accepted, _, cx| view.update(cx, |card, _| card.verdicts.push(accepted)),
),
)
.child(
canvas(
move |bounds, _, _| height.set(bounds.size.height),
|_, _, _, _| {},
// gpui fills the window with an auto-sized root, so the measured box sits inside one.
div().child(
div()
.relative()
.w(px(640.0))
.child(
FileChangeCard::new("card", change("src/theme/lift.rs")).on_decide(
move |accepted, _, cx| {
view.update(cx, |card, _| card.verdicts.push(accepted))
},
),
)
.absolute()
.top_0()
.left_0()
.size_full(),
)
.child(
canvas(
move |bounds, _, _| height.set(bounds.size.height),
|_, _, _, _| {},
)
.absolute()
.top_0()
.left_0()
.size_full(),
),
)
}
}
@@ -114,8 +119,8 @@ fn review(cx: &mut TestAppContext) -> (Entity<Review>, &mut VisualTestContext) {
#[gpui::test]
fn accept_all_decides_every_file(cx: &mut TestAppContext) {
let (view, cx) = review(cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
cx.update(|window, cx| window.focus_next(cx));
press("enter", cx);
assert_eq!(
view.read_with(cx, |review, _| review.decisions.clone()),
@@ -127,7 +132,7 @@ fn accept_all_decides_every_file(cx: &mut TestAppContext) {
fn a_cards_verdict_names_its_file(cx: &mut TestAppContext) {
let (view, cx) = review(cx);
for _ in 0..8 {
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
}
press("enter", cx);
assert_eq!(
@@ -145,26 +150,28 @@ struct Narrow {
impl Render for Narrow {
fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
let height = self.height.clone();
div()
.relative()
.w(self.width)
.child(
MultiFileDiffReview::new(
"narrow",
["src/theme/lift.rs", "src/theme/tokens.rs"].map(change),
div().child(
div()
.relative()
.w(self.width)
.child(
MultiFileDiffReview::new(
"narrow",
["src/theme/lift.rs", "src/theme/tokens.rs"].map(change),
)
.on_decide(|_, _, _| {}),
)
.on_decide(|_, _, _| {}),
)
.child(
canvas(
move |bounds, _, _| height.set(bounds.size.height),
|_, _, _, _| {},
)
.absolute()
.top_0()
.left_0()
.size_full(),
)
.child(
canvas(
move |bounds, _, _| height.set(bounds.size.height),
|_, _, _, _| {},
)
.absolute()
.top_0()
.left_0()
.size_full(),
),
)
}
}
src/agent/tests/control.rs
+4 -4
View File
@@ -58,10 +58,10 @@ fn asked(cx: &mut TestAppContext) -> (Entity<Asked>, &mut VisualTestContext) {
#[gpui::test]
fn a_pick_answers_the_question_and_the_answer_stands_alone(cx: &mut TestAppContext) {
let (view, cx) = asked(cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
cx.update(|window, cx| window.focus_next(cx));
press("enter", cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
press("enter", cx);
assert_eq!(
view.read_with(cx, |asked, _| asked.answers.clone()),
@@ -74,7 +74,7 @@ fn a_pick_answers_the_question_and_the_answer_stands_alone(cx: &mut TestAppConte
fn enter_sends_a_written_answer_and_skips_a_blank_one(cx: &mut TestAppContext) {
let (view, cx) = asked(cx);
for _ in 0..3 {
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
}
cx.simulate_input(" ");
press("enter", cx);
src/agent/tests/environment.rs
+5 -5
View File
@@ -62,7 +62,7 @@ fn memories(cx: &mut TestAppContext) -> (Entity<Memories>, &mut VisualTestContex
#[gpui::test]
fn enter_keeps_a_memory_and_empties_the_field(cx: &mut TestAppContext) {
let (view, cx) = memories(cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
cx.simulate_input(" ");
press("enter", cx);
cx.simulate_input("Lifts stay under 20%");
@@ -113,9 +113,9 @@ fn a_servers_switch_turns_it_off_and_on(cx: &mut TestAppContext) {
let (view, cx) = cx.add_window_view(|_, _| Servers { thrown: Vec::new() });
cx.update(|window, _| window.activate_window());
settle(cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
press("space", cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
press("space", cx);
let thrown = view.read_with(cx, |servers, _| servers.thrown.clone());
assert_eq!(thrown, [("files".into(), false), ("web".into(), true)]);
@@ -152,9 +152,9 @@ fn every_checkpoint_but_the_current_rewinds(cx: &mut TestAppContext) {
let (view, cx) = cx.add_window_view(|_, _| Points { asked: Vec::new() });
cx.update(|window, _| window.activate_window());
settle(cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
press("enter", cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
press("enter", cx);
assert_eq!(
view.read_with(cx, |points, _| points.asked.clone()),
src/agent/tests/mod.rs
+1 -1
View File
@@ -120,7 +120,7 @@ fn the_prompt_walks_deny_always_then_once(cx: &mut TestAppContext) {
cx.update(|window, _| window.activate_window());
settle(cx);
for _ in 0..3 {
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
}
press("enter", cx);
assert_eq!(
src/agent/tests/previews.rs
+43 -38
View File
@@ -43,8 +43,8 @@ fn a_frame_shows_from_the_keyboard(cx: &mut TestAppContext) {
let (view, cx) = cx.add_window_view(|_, _| Browsing { asked: Vec::new() });
cx.update(|window, _| window.activate_window());
settle(cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
cx.update(|window, cx| window.focus_next(cx));
press("enter", cx);
assert_eq!(
view.read_with(cx, |browsing, _| browsing.asked.clone()),
@@ -97,8 +97,8 @@ fn the_source_shows_when_asked(cx: &mut TestAppContext) {
cx.update(|window, _| window.activate_window());
settle(cx);
assert!(!drew.get(), "the preview shows first");
cx.update(|window, _| window.focus_next());
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
cx.update(|window, cx| window.focus_next(cx));
press("enter", cx);
assert!(drew.get(), "the source shows once asked");
}
@@ -113,23 +113,26 @@ impl Render for Strip {
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let (view, height) = (cx.entity(), self.height.clone());
let frames = (0..8).map(|ix| format!("{ix}.png"));
div()
.relative()
.w(px(280.0))
.child(
BrowserPreview::new("strip", "localhost", frames, 0)
.on_show(move |ix, _, cx| view.update(cx, |strip, _| strip.asked.push(ix))),
)
.child(
canvas(
move |bounds, _, _| height.set(bounds.size.height),
|_, _, _, _| {},
// gpui fills the window with an auto-sized root, so the measured box sits inside one.
div().child(
div()
.relative()
.w(px(280.0))
.child(
BrowserPreview::new("strip", "localhost", frames, 0)
.on_show(move |ix, _, cx| view.update(cx, |strip, _| strip.asked.push(ix))),
)
.absolute()
.top_0()
.left_0()
.size_full(),
)
.child(
canvas(
move |bounds, _, _| height.set(bounds.size.height),
|_, _, _, _| {},
)
.absolute()
.top_0()
.left_0()
.size_full(),
),
)
}
}
@@ -226,7 +229,7 @@ fn tab_brings_a_hidden_frame_into_view(cx: &mut TestAppContext) {
cx.update(|window, _| window.activate_window());
settle(cx);
for _ in 0..8 {
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
settle(cx);
}
settle(cx);
@@ -254,24 +257,26 @@ struct Screen {
impl Render for Screen {
fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
let height = self.height.clone();
div()
.relative()
.w(px(480.0))
.child(
ComputerUseViewer::new("screen", "a.png")
.ratio(4.0 / 3.0)
.pointer(point(0.5, 0.95)),
)
.child(
canvas(
move |bounds, _, _| height.set(bounds.size.height),
|_, _, _, _| {},
div().child(
div()
.relative()
.w(px(480.0))
.child(
ComputerUseViewer::new("screen", "a.png")
.ratio(4.0 / 3.0)
.pointer(point(0.5, 0.95)),
)
.absolute()
.top_0()
.left_0()
.size_full(),
)
.child(
canvas(
move |bounds, _, _| height.set(bounds.size.height),
|_, _, _, _| {},
)
.absolute()
.top_0()
.left_0()
.size_full(),
),
)
}
}