Marshall Bowers
b8ae949dbe
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
2023-10-30 10:40:48 -04:00
Marshall Bowers
61cc3b93e3
Factor out ThemePrinter into its own module
2023-10-30 10:40:46 -04:00
Antonio Scandurra
25e882d72a
Remove randomness from GPUI2 block_with_timeout
2023-10-30 12:10:55 +01:00
Kirill Bulatov
b3c3adab50
Port prettier panic fix to gpui2
2023-10-30 13:00:49 +02:00
Kirill Bulatov
bd30ce837d
Do not panic when looking for prettier ( #3182 )
...
Fixes
https://zed-industries.slack.com/archives/C04S6T1T7TQ/p1698655595438009
Instead of checking FS, derive the prettier path needed and let prettier
invocation fail in logs instead.
2023-10-30 12:59:46 +02:00
Kirill Bulatov
f16ff79ff8
Properly log prettier paths
2023-10-30 11:17:11 +02:00
Joseph T. Lyons
6b65d76014
Port journal to GPUI2
2023-10-28 11:37:25 -04:00
Nathan Sobo
e27427dce8
Merge branch 'gpui2-docs' into zed2
2023-10-27 17:07:28 -06:00
Nathan Sobo
f88ca2e7da
Add docs for window.rs, but still incomplete
2023-10-27 22:29:59 +02:00
Nathan Sobo
ad7c49e4bb
Add doc comments to app.rs
2023-10-27 21:19:48 +02:00
Conrad Irwin
b4225ac82a
Port changes from #3118 to zed2
2023-10-27 13:27:55 +02:00
Conrad Irwin
ba189f2af1
Port changes from #3154 to zed2
2023-10-27 13:24:37 +02:00
Conrad Irwin
67ecc2fe04
Comment out failing gpui2 test
2023-10-27 11:24:23 +02:00
Conrad Irwin
af0c010b4a
Remove deadlock from gpui2 pasteboard
2023-10-27 11:14:13 +02:00
Conrad Irwin
d2ab0d651e
Get cargo test --workspace compiling again
2023-10-27 11:03:30 +02:00
Conrad Irwin
079de6fdf7
Rename last async_iife
2023-10-27 10:56:24 +02:00
Conrad Irwin
4a6a17d866
Merge branch 'main' into zed2
2023-10-27 10:55:15 +02:00
Conrad Irwin
5f5234c5da
Fix fs2 tests
2023-10-27 10:51:36 +02:00
Conrad Irwin
c1904b493b
Fix cargo fmt
2023-10-27 10:44:57 +02:00
Nathan Sobo
bcdffc9963
Merge branch 'zed2-views' into zed2
2023-10-26 19:41:59 +02:00
Nathan Sobo
a1c3826858
Add View::update which provides a ViewContext
2023-10-26 19:41:42 +02:00
Conrad Irwin
071e9b4871
Revert entitlements change
2023-10-26 18:27:34 +02:00
Antonio Scandurra
8e3314e680
WIP
2023-10-26 18:17:45 +02:00
Julia
a23e05c20b
Limit language server reinstallation attempts
...
zed2 electric boogaloo
2023-10-26 17:16:04 +02:00
Antonio Scandurra
516236e044
Disable livekit on zed2
2023-10-26 17:15:19 +02:00
Antonio Scandurra
637cff3ebd
WIP
2023-10-26 17:15:19 +02:00
Julia
8db3b3b4ca
Limit language server reinstallation attempts
2023-10-26 17:14:34 +02:00
Joseph T. Lyons
98d03f6e7a
Revert "Add activity_indicator2"
...
This reverts commit 88a3a57789
2023-10-26 17:13:40 +02:00
Marshall Bowers
560e115656
Pull syntax colors from JSON theme
2023-10-26 17:06:05 +02:00
Marshall Bowers
973ca8d4f0
ui2: Remove dependency on theme crate
2023-10-26 16:50:04 +02:00
Marshall Bowers
692aeff263
ui2: Remove dependency on settings crate
2023-10-26 16:50:04 +02:00
Joseph T. Lyons
88a3a57789
Add activity_indicator2
2023-10-26 16:49:39 +02:00
Marshall Bowers
61694bba6a
Remove unneeded constructors for stories
2023-10-26 16:46:49 +02:00
Max Brunsfeld
65045b9c52
Get remaining language2 tests passing
2023-10-26 16:38:50 +02:00
Max Brunsfeld and Marshall Bowers
0eae962abf
Represent theme's syntax colors with string keys
...
Co-authored-by: Marshall Bowers <marshall@zed.dev >
2023-10-26 16:38:50 +02:00
Marshall Bowers
a569c82492
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
2023-10-26 15:59:21 +02:00
Marshall Bowers
ed233d583f
ui2: Remove ElementExt trait
2023-10-26 15:59:18 +02:00
Max Brunsfeld and Conrad
b3ad8c1c3e
Get most of the language2 tests passing
...
Co-authored-by: Conrad <conrad@zed.dev >
2023-10-26 15:57:12 +02:00
Max Brunsfeld and Conrad
3cc91e5742
Add missing seed variable for gpui2 test macro
...
Co-authored-by: Conrad <conrad@zed.dev >
2023-10-26 15:57:12 +02:00
Marshall Bowers
6784ccd9fe
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
2023-10-26 15:54:48 +02:00
Marshall Bowers
1887f3b594
Rename S type to V
2023-10-26 15:54:43 +02:00
Max Brunsfeld and Conrad
8bc2071414
Fix gpui2 bugs
...
* Compile error for tests that take StdRng
* Dynamic type dowcasting error when emitting events
* Slot error when dropping handles
Co-authored-by: Conrad <conrad@zed.dev >
2023-10-26 15:54:19 +02:00
Antonio Scandurra
58e8012d8c
Make zed2 compile again
2023-10-26 15:45:30 +02:00
Marshall Bowers
8a70ef3e8f
Remove unused state_type
2023-10-26 15:45:08 +02:00
Marshall Bowers
eb19071d84
ui2: Clean up takes
2023-10-26 15:44:39 +02:00
Marshall Bowers
7b4a895ab9
ui2: Clean up drains
2023-10-26 15:41:29 +02:00
Marshall Bowers
d62c51a4b8
Merge branch 'gpui2-element-renderer' into zed2
2023-10-26 15:23:02 +02:00
Marshall Bowers
fccc4ca85c
Initialize element before layout
2023-10-26 15:22:48 +02:00
Marshall Bowers
42095f0673
Remove debug from derive Component proc macro
2023-10-26 15:22:38 +02:00
Marshall Bowers
88ef74ec8f
Checkpoint: Compiling after view type removal
2023-10-26 15:20:38 +02:00
Marshall Bowers