Marshall Bowers
98e2490807
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
2023-10-25 18:20:22 +02:00
Marshall Bowers
a0fe859d87
Make theme converter spit out valid Rust structs
2023-10-25 18:20:16 +02:00
51fb33d8ef
Allow different app contexts to race
...
Co-Authored-By: Max <max@zed.dev >
Co-Authored-By: Kyle <kyle@zed.dev >
Co-Authored-By: Conrad <conrad@zed.dev >
2023-10-25 18:11:38 +02:00
Max Brunsfeld
3a369bc207
Name embedded.provisionprofile the same on stable as other channels
2023-10-25 18:02:27 +02:00
92535ba2c4
Introduce TestAppContext
...
Co-Authored-By: Max <max@zed.dev >
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com >
Co-Authored-By: Kyle Caverly <kyle@zed.dev >
2023-10-25 17:55:20 +02:00
Antonio Scandurra
6f6495ccbf
Fix error
2023-10-25 17:41:40 +02:00
Marshall Bowers
08a4e53cfe
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
2023-10-25 17:38:52 +02:00
Marshall Bowers
c8a86c2dd1
theme2: Add Rosé Pine themes
2023-10-25 17:38:48 +02:00
Max Brunsfeld
841a5ef7b8
collab 0.27.0
2023-10-25 17:38:09 +02:00
Max Brunsfeld
2c5caf91bc
Bump RPC version for channels + notifications changes
2023-10-25 17:37:14 +02:00
3566d920c5
Add deterministic TestDispatcher
...
Co-Authored-By: Conrad Irwin <conrad@zed.dev >
Co-Authored-By: Max Brunsfeld <max@zed.dev >
Co-Authored-By: Kyle Caverly <kyle@zed.dev >
2023-10-25 17:33:55 +02:00
Marshall Bowers
cee8175c19
theme2: Add Sandcastle theme
2023-10-25 17:27:25 +02:00
Marshall Bowers
751df45263
Print out Theme structs in theme_converter
2023-10-25 17:24:34 +02:00
Max Brunsfeld
eb8d376274
Avoid unused import in release builds
2023-10-25 17:16:29 +02:00
Mikayla Maki
f67f42779b
Rename IIFE to maybe ( #3165 )
...
Too good of an idea to forget
Release Notes:
- N/A
2023-10-25 17:09:12 +02:00
Marshall Bowers
6b5947a1fa
Start work on theme converter
2023-10-25 16:54:26 +02:00
Marshall Bowers
437d147935
Rename player to players
2023-10-25 16:39:06 +02:00
Marshall Bowers
0867175a4e
Remove reference to removed ThemeColor
2023-10-25 16:34:03 +02:00
Marshall Bowers
4fcbc91aca
Add note about fixing dead_code and unused_variables warnings in ui2
2023-10-25 16:33:33 +02:00
Marshall Bowers
e1032c5341
Remove ThemeColor in favor of theme2::Theme
2023-10-25 16:32:44 +02:00
KCaverly
71bc35d241
catchup with main
2023-10-25 16:31:00 +02:00
Joseph T. Lyons
c44d1cda9a
collab 0.26.0
2023-10-25 16:24:53 +02:00
Mikayla
26a3d41dc7
Change from try (reserved keyword) to maybe
2023-10-25 07:10:21 -07:00
Joseph T. Lyons
71c72d8e08
v0.111.x dev
2023-10-25 16:07:54 +02:00
Marshall Bowers
bb3f59252e
Rename theme2 getter to theme
2023-10-25 16:04:49 +02:00
Marshall Bowers
258496700f
Rename theme getter to old_theme
2023-10-25 16:02:47 +02:00
Marshall Bowers
8043d0d8a9
Reference theme2 colors in ThemeColor
2023-10-25 15:58:56 +02:00
Max Brunsfeld
90f65ec9fe
Remove logic for multiple channel parents ( #3162 )
...
This PR simplifies our state management for channels, and logic for
inheriting channel permissions, by removing the ability for channels to
have multiple parent channels.
2023-10-25 15:57:55 +02:00
Conrad Irwin
4f859e0253
link to channel notes ( #3167 )
...
Release Notes:
- Add links to channel notes
2023-10-25 15:53:34 +02:00
Marshall Bowers
dd34bb273e
Load Theme from theme2 into the storybook
2023-10-25 15:50:50 +02:00
Max Brunsfeld
b5cbfb8f1d
Allow moving channels to the root
2023-10-25 15:50:37 +02:00
Max Brunsfeld
32367eba14
Set up UI to allow dragging a channel to the root
2023-10-25 15:39:02 +02:00
42259a4007
Fix channel dragging
...
Co-authored-by: Conrad <conrad@zed.dev >
Co-authored-by: Joseph <joseph@zed.dev >
2023-10-25 09:41:16 +02:00
Conrad Irwin
70eeefa1f8
Fix channel collapsing
2023-10-25 09:27:17 +02:00
Conrad Irwin
6f173c64b3
Fix tests by re-instating paths in the new format
2023-10-25 09:22:06 +02:00
Conrad Irwin
b8bd070a83
Fix panic by disallowing multiple room joins ( #3149 )
...
Release Notes:
- Fixed panic that could occur when switching channels quickly
2023-10-24 23:57:08 +02:00
Joseph T. Lyons
c77376225d
Allow completion menus to be cycled ( #3164 )
...
Not a huge ask from the community, but something that I run into
frequently is not being able to cycle the auto completion menus past the
beginning / end, so I quickly added it. This matches VS Code behavior:
https://github.com/zed-industries/zed/assets/19867440/bc4606d7-2076-4036-aedc-f3cf5ba349dc
Release Notes:
- Enhanced popover menus with circular navigation
([#632 ](https://github.com/zed-industries/community/issues/632 )).
2023-10-24 23:08:10 +02:00
Mikayla Maki
beb0af9763
Rename IIFE to try
...
Too good of an idea to forget
2023-10-24 21:13:22 +02:00
Conrad Irwin
1411b98a5d
link to channel notes
2023-10-24 19:48:31 +02:00
Joseph T. Lyons
1c5b321058
Allow completion menus to be cycled
2023-10-24 19:29:44 +02:00
Kirill Bulatov and Nathan Sobo
a01b507ef4
Add OS file drop event handler
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-10-24 19:26:06 +02:00
Conrad Irwin
dfc34e582a
Fix extra race
2023-10-24 18:54:55 +02:00
Marshall Bowers
5b04f965fa
Update Cargo.lock
2023-10-24 18:25:48 +02:00
Kirill Bulatov
77991ad865
Fix compilation
2023-10-24 18:22:26 +02:00
Marshall Bowers
afad2fbfa2
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
2023-10-24 17:58:42 +02:00
Marshall Bowers
d6bd000aa8
Rename cx.global_default_mut to cx.global_default
2023-10-24 17:58:14 +02:00
Julia
bfdff4e2e0
When navigating diagnostics, skip diagnostic containing cursor
...
Slightly unfortunate but prevents an issue with weirdly overlapping
diagnostics causing the cursor to bounce between them
2023-10-24 17:56:56 +02:00
Marshall Bowers
4ca7ddfc42
Finish up ThemeRegistry and remove AnyAssetSource
2023-10-24 17:47:41 +02:00
Marshall Bowers
51c66f508b
Merge branch 'zed2' into theme2
2023-10-24 17:29:25 +02:00
5c03b6a610
Remove logic for multiple channel parents
...
Co-authored-by: Conrad <conrad@zed.dev >
Co-authored-by: Kyle <kyle@zed.dev >
Co-authored-by: Joseph <joseph@zed.dev >
2023-10-24 17:29:23 +02:00
Marshall Bowers
Max Brunsfeld
Mikayla Maki
Joseph T. Lyons
Kirill BulatovandNathan Sobo
Julia