Commit Graph
39175 Commits
Author SHA1 Message Date
193feb5708 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 374cadd920 Fix error 2023-10-25 17:41:40 +02:00
Marshall Bowers 07175ea3d0 Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-25 17:38:52 +02:00
Marshall Bowers a47eb2d762 theme2: Add Rosé Pine themes 2023-10-25 17:38:48 +02:00
Max Brunsfeld 56448f8444 collab 0.27.0 2023-10-25 17:38:09 +02:00
Max Brunsfeld 00432b613d Bump RPC version for channels + notifications changes 2023-10-25 17:37:14 +02:00
0dc4044882 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 acaba6a9ff theme2: Add Sandcastle theme 2023-10-25 17:27:25 +02:00
Marshall Bowers 86236740c9 Print out Theme structs in theme_converter 2023-10-25 17:24:34 +02:00
Max Brunsfeld 790d497c27 Avoid unused import in release builds 2023-10-25 17:16:29 +02:00
Mikayla Maki ba82f7fe33 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 e4603292eb Start work on theme converter 2023-10-25 16:54:26 +02:00
Marshall Bowers 412d023056 Rename player to players 2023-10-25 16:39:06 +02:00
Marshall Bowers a7d93134bb Remove reference to removed ThemeColor 2023-10-25 16:34:03 +02:00
Marshall Bowers f4fad48264 Add note about fixing dead_code and unused_variables warnings in ui2 2023-10-25 16:33:33 +02:00
Marshall Bowers 3c859599a0 Remove ThemeColor in favor of theme2::Theme 2023-10-25 16:32:44 +02:00
KCaverly 01910447eb catchup with main 2023-10-25 16:31:00 +02:00
Joseph T. Lyons 6431265fe5 collab 0.26.0 2023-10-25 16:24:53 +02:00
Mikayla be7e30fbb1 Change from try (reserved keyword) to maybe 2023-10-25 07:10:21 -07:00
Joseph T. Lyons 2d24b92aef v0.111.x dev 2023-10-25 16:07:54 +02:00
Marshall Bowers c1e03b9859 Rename theme2 getter to theme 2023-10-25 16:04:49 +02:00
Marshall Bowers 8b25d94ada Rename theme getter to old_theme 2023-10-25 16:02:47 +02:00
Marshall Bowers 48100849a2 Reference theme2 colors in ThemeColor 2023-10-25 15:58:56 +02:00
Max Brunsfeld ef83a44d32 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 df648f3caf link to channel notes (#3167)
Release Notes:

- Add links to channel notes
2023-10-25 15:53:34 +02:00
Marshall Bowers 98c2331f3a Load Theme from theme2 into the storybook 2023-10-25 15:50:50 +02:00
Max Brunsfeld 0bf3d36ae7 Allow moving channels to the root 2023-10-25 15:50:37 +02:00
Max Brunsfeld 7f767a024c Set up UI to allow dragging a channel to the root 2023-10-25 15:39:02 +02:00
22a837943b 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 ca0e023ee3 Fix channel collapsing 2023-10-25 09:27:17 +02:00
Conrad Irwin f7c1b25ca4 Fix tests by re-instating paths in the new format 2023-10-25 09:22:06 +02:00
Conrad Irwin 837755b5c7 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 48a25fe374 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 2a04fb7b34 Rename IIFE to try
Too good of an idea to forget
2023-10-24 21:13:22 +02:00
Conrad Irwin 14e0931b00 link to channel notes 2023-10-24 19:48:31 +02:00
Joseph T. Lyons 5a9ce39478 Allow completion menus to be cycled 2023-10-24 19:29:44 +02:00
Kirill BulatovandNathan Sobo a7b792e5ab Add OS file drop event handler
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-10-24 19:26:06 +02:00
Conrad Irwin 38a00ade0f Fix extra race 2023-10-24 18:54:55 +02:00
Marshall Bowers 25b37522c7 Update Cargo.lock 2023-10-24 18:25:48 +02:00
Kirill Bulatov cf354de5e0 Fix compilation 2023-10-24 18:22:26 +02:00
Marshall Bowers b7d8756f93 Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-24 17:58:42 +02:00
Marshall Bowers 29e72d4d10 Rename cx.global_default_mut to cx.global_default 2023-10-24 17:58:14 +02:00
Julia 80e59b5a01 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 9fb7fe1aed Finish up ThemeRegistry and remove AnyAssetSource 2023-10-24 17:47:41 +02:00
Marshall Bowers f6589a14be Merge branch 'zed2' into theme2 2023-10-24 17:29:25 +02:00
e3864cb084 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
Max Brunsfeld dd85f6448f Guest roles (#3140)
Release Notes:

- Added a "guest" role to channels, and made that the default when a new
user joins a public channel.
2023-10-24 17:29:14 +02:00
Marshall Bowers 6b926ac077 Checkpoint 2023-10-24 17:29:03 +02:00
Kirill Bulatov ba8bd2f703 Make audio2 2023-10-24 17:15:59 +02:00
Marshall Bowers 89f700c938 Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-24 17:00:11 +02:00