Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fab6557
input: Add line decorations with row backgrounds and gutter markers (…
glani Oct 7, 2026
b566c45
scrollbar: Let the vertical scrollbar sit on the left side (#3416)
glani Oct 9, 2026
76ce735
editor: Support mirrored gutters for side-by-side diffs (#3417)
glani Oct 9, 2026
c39b0dd
editor: Clip the text to its own side of the gutter (#3426)
glani Oct 11, 2026
21284df
editor: Expose read-only access to the display map (#3465)
glani Oct 14, 2026
5d250a8
editor: Add spacer rows to the display map (#3466)
glani Oct 15, 2026
18f898c
editor: Add hit_test and gutter_bounds to the input state (#3520)
glani Oct 16, 2026
d5da0f6
editor: Tell a custom context menu whether it was opened on the gutte…
glani Oct 19, 2026
b00ef3d
Merge branch 'main' into land-next
glani Nov 14, 2026
cef53cc
Merge branch 'main' into land-next
glani Nov 15, 2026
8eaf516
Merge branch 'main' into land-next
glani Nov 16, 2026
e2cb377
Merge branch 'main' into land-next
glani Nov 16, 2026
d2b0938
Merge branch 'main' into land-next
glani Nov 16, 2026
8348c31
Merge branch 'main' into land-next
glani Nov 17, 2026
4ea717e
editor: Merge main into line decorations
huacnlee Nov 17, 2026
0a40545
Merge branch 'main' into land-next
glani Nov 17, 2026
0209cf1
Merge branch 'main' into land-next
glani Nov 17, 2026
7456cb3
Merge branch 'main' into land-next
glani Nov 18, 2026
7597f79
Merge branch 'main' into land-next
glani Nov 18, 2026
abd4d27
Merge branch 'main' into land-next
glani Nov 18, 2026
a87d0d9
Merge branch 'main' into land-next
glani Nov 19, 2026
6d112bf
editor: Merge main and align custom gutter geometry
huacnlee Nov 20, 2026
767a3ae
Merge branch 'main' into land-next
glani Nov 21, 2026
61d62d5
Merge branch 'main' into land-next
glani Nov 21, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
"examples/hello_world",
"examples/input",
"examples/editor",
"examples/editor_gutter_menu",
"examples/editor_spacers",
"examples/syntect",
"examples/tig",
"examples/brush",
Expand Down Expand Up @@ -45,7 +47,7 @@
resolver = "2"

[workspace.package]
publish = false

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (WebAssembly)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (macos-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Lint

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Lint

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (windows-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (ubuntu-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-windows-msvc, windows-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-linux-gnu)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-linux-gnu)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-windows-msvc)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-windows-msvc)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (aarch64-apple-darwin)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (aarch64-apple-darwin)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-linux-gnu, ubuntu-latest)

unused field `publish` in `workspace.package`

Check warning on line 50 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-linux-gnu, ubuntu-latest)

unused field `publish` in `workspace.package`
edition = "2024"

[workspace.dependencies]
Expand All @@ -55,9 +57,9 @@
gpui-component-macros = { path = "crates/component-macros", version = "0.10.0" }
gpui-kit-assets = { path = "crates/assets", version = "0.10.0" }
gpui-fps = { path = "crates/fps", version = "0.10.0" }
gpui-shell = { path = "crates/shell", version = "0.10.0" }

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (WebAssembly)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (macos-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Lint

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Lint

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (windows-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (ubuntu-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-windows-msvc, windows-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-linux-gnu)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-linux-gnu)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-windows-msvc)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-windows-msvc)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (aarch64-apple-darwin)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (aarch64-apple-darwin)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-linux-gnu, ubuntu-latest)

unused workspace dependency `gpui-shell`

Check warning on line 60 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-linux-gnu, ubuntu-latest)

unused workspace dependency `gpui-shell`
gpui-webview = { path = "crates/webview", version = "0.10.0" }
story = { path = "crates/story" }

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (WebAssembly)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (macos-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Lint

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Lint

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (windows-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (ubuntu-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-windows-msvc, windows-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-linux-gnu)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-linux-gnu)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-windows-msvc)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-windows-msvc)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (aarch64-apple-darwin)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (aarch64-apple-darwin)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-linux-gnu, ubuntu-latest)

unused workspace dependency `story`

Check warning on line 62 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-linux-gnu, ubuntu-latest)

unused workspace dependency `story`

# GPUI comes from the `gpui-pre-*` snapshots of Zed's crates, and any snapshot
# may change GPUI's API. These requirements are what the published gpui-kit
Expand Down Expand Up @@ -114,9 +116,9 @@
] }
two-face = { version = "0.4.5", default-features = false, features = ["syntect-fancy"] }
tracing = "0.1.41"
wasm-bindgen = "0.2.113"

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (WebAssembly)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (macos-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Lint

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Lint

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (windows-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (ubuntu-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-windows-msvc, windows-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-linux-gnu)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-linux-gnu)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-windows-msvc)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-windows-msvc)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (aarch64-apple-darwin)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (aarch64-apple-darwin)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-linux-gnu, ubuntu-latest)

unused workspace dependency `wasm-bindgen`

Check warning on line 119 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-linux-gnu, ubuntu-latest)

unused workspace dependency `wasm-bindgen`
# Use errno stub for WASM
errno = { version = "0.3.14", default-features = false }

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (WebAssembly)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (macos-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / No default features

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Lint

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Lint

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (windows-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (aarch64-apple-darwin, macos-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Components

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (ubuntu-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / WebView on gpui-pre (ubuntu-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (windows-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-windows-msvc, windows-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-linux-gnu)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-linux-gnu)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-windows-msvc)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (x86_64-windows-msvc)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (aarch64-apple-darwin)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Standard Runtime (aarch64-apple-darwin)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Shell Core

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / GPUI Fast (macos-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-linux-gnu, ubuntu-latest)

unused workspace dependency `errno`

Check warning on line 121 in Cargo.toml

View workflow job for this annotation

GitHub Actions / Test (x86_64-linux-gnu, ubuntu-latest)

unused workspace dependency `errno`

[workspace.dependencies.windows]
features = ["Wdk", "Wdk_System", "Wdk_System_SystemServices"]
Expand Down
75 changes: 24 additions & 51 deletions crates/base/examples/showcase/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,16 @@ pub struct BaseShowcase {
text_selection_footer_bounds: Rc<std::cell::RefCell<Option<gpui::Bounds<gpui::Pixels>>>>,
}

/// The showcase's editor colors, assigned over the defaults.
fn editor_style() -> InputEditorStyle {
let mut style = InputEditorStyle::default();
style.foreground = example_rgb(0x171717).into();
style.muted_foreground = example_rgb(0x737373).into();
style.selection = gpui::hsla(0.6, 0.8, 0.7, 0.45);
style.caret = example_rgb(0x171717).into();
style
}

impl BaseShowcase {
pub fn new(component: impl Into<String>, window: &mut Window, cx: &mut Context<Self>) -> Self {
activate_palette(window, cx);
Expand All @@ -191,24 +201,12 @@ impl BaseShowcase {
} else {
"Hello GPUI"
});
state.set_editor_style(InputEditorStyle {
foreground: example_rgb(0x171717).into(),
muted_foreground: example_rgb(0x737373).into(),
selection: gpui::hsla(0.6, 0.8, 0.7, 0.45),
caret: example_rgb(0x171717).into(),
..InputEditorStyle::default()
});
state.set_editor_style(editor_style());
state
});
let toolbar_search = cx.new(|cx| {
let mut state = InputState::new(window, cx).placeholder("Search");
state.set_editor_style(InputEditorStyle {
foreground: example_rgb(0x171717).into(),
muted_foreground: example_rgb(0x737373).into(),
selection: gpui::hsla(0.6, 0.8, 0.7, 0.45),
caret: example_rgb(0x171717).into(),
..InputEditorStyle::default()
});
state.set_editor_style(editor_style());
state
});
let otp = cx.new(|cx| OtpState::new(6, window, cx).default_value("12"));
Expand All @@ -225,13 +223,7 @@ impl BaseShowcase {
});
let textarea_base = textarea.clone();
textarea_base.update(cx, |state, _| {
state.set_editor_style(InputEditorStyle {
foreground: example_rgb(0x171717).into(),
muted_foreground: example_rgb(0x737373).into(),
selection: gpui::hsla(0.6, 0.8, 0.7, 0.45),
caret: example_rgb(0x171717).into(),
..InputEditorStyle::default()
});
state.set_editor_style(editor_style());
});
let editor = cx.new(|cx| {
EditorState::new(window, cx)
Expand All @@ -250,24 +242,13 @@ impl BaseShowcase {
}),
cx,
);
state.set_editor_style(InputEditorStyle {
foreground: example_rgb(0x171717).into(),
muted_foreground: example_rgb(0x737373).into(),
selection: gpui::hsla(0.6, 0.8, 0.7, 0.45),
caret: example_rgb(0x171717).into(),
highlight_styles: Arc::new(ShowcaseHighlightStyles),
..InputEditorStyle::default()
});
let mut style = editor_style();
style.highlight_styles = Arc::new(ShowcaseHighlightStyles);
state.set_editor_style(style);
});
let combobox_query = cx.new(|cx| {
let mut state = InputState::new(window, cx).placeholder("Search frameworks…");
state.set_editor_style(InputEditorStyle {
foreground: example_rgb(0x171717).into(),
muted_foreground: example_rgb(0x737373).into(),
selection: gpui::hsla(0.6, 0.8, 0.7, 0.45),
caret: example_rgb(0x171717).into(),
..InputEditorStyle::default()
});
state.set_editor_style(editor_style());
state
});
cx.subscribe(
Expand Down Expand Up @@ -434,26 +415,18 @@ impl BaseShowcase {
}

fn refresh_editor_styles(&self, cx: &mut Context<Self>) {
let style = || InputEditorStyle {
foreground: example_rgb(0x171717).into(),
muted_foreground: example_rgb(0x737373).into(),
selection: gpui::hsla(0.6, 0.8, 0.7, 0.45),
caret: example_rgb(0x171717).into(),
..InputEditorStyle::default()
};
self.input
.update(cx, |state, _| state.set_editor_style(style()));
.update(cx, |state, _| state.set_editor_style(editor_style()));
self.textarea
.update(cx, |state, _| state.set_editor_style(style()));
.update(cx, |state, _| state.set_editor_style(editor_style()));
self.combobox_query
.update(cx, |state, _| state.set_editor_style(style()));
.update(cx, |state, _| state.set_editor_style(editor_style()));
self.toolbar_search
.update(cx, |state, _| state.set_editor_style(style()));
.update(cx, |state, _| state.set_editor_style(editor_style()));
self.editor.update(cx, |state, _| {
state.set_editor_style(InputEditorStyle {
highlight_styles: Arc::new(ShowcaseHighlightStyles),
..style()
});
let mut style = editor_style();
style.highlight_styles = Arc::new(ShowcaseHighlightStyles);
state.set_editor_style(style);
});
}

Expand Down
Loading
Loading