Joseph T. Lyons
5d3394bf28
Revert "Delete feedback_modal.rs"
...
This reverts commit ca4b016ddc
2023-12-06 14:13:56 -05:00
Joseph T. Lyons
c6e2d20500
WIP
2023-12-06 14:13:44 -05:00
Marshall Bowers
ea5e5e61ef
Port assistant crate to Zed2 ( #3513 )
...
This PR contains the initial port of the `assistant` crate to Zed2.
Release Notes:
- N/A
2023-12-06 14:04:01 -05:00
Marshall Bowers
d43165a04f
Update inline assist styles
2023-12-06 13:52:38 -05:00
Joseph T. Lyons
ca4b016ddc
Delete feedback_modal.rs
2023-12-06 13:26:20 -05:00
Antonio Scandurra and Marshall
a82902714b
Paint blocks on top of the editor
...
This ensures blocks get mouse events before the editor beneath
them.
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-06 19:15:09 +01:00
Antonio Scandurra and Marshall
4aab4c5411
Use a handler instead of an action for clicks
...
This prevents dispatching actions on buttons that were not the target of the click.
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-06 19:12:01 +01:00
Antonio Scandurra and Marshall
5f331ddbb8
Move assistant actions to the top of the crate
...
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-06 18:39:50 +01:00
Joseph T. Lyons
3a986d3400
Merge branch 'main' of https://github.com/zed-industries/zed
2023-12-06 12:37:20 -05:00
Joseph T. Lyons
38e979221b
collab 0.30.0
2023-12-06 12:34:47 -05:00
Antonio Scandurra
c62305edea
Merge remote-tracking branch 'origin/main' into assistant-2
...
# Conflicts:
# crates/ui2/src/components/icon.rs
2023-12-06 18:18:58 +01:00
Antonio Scandurra
f5edae4353
Introduce app menus in zed2 ( #3511 )
...
Release Notes:
- N/A
2023-12-06 18:17:02 +01:00
Marshall Bowers
180e597117
v0.117.x dev
2023-12-06 12:03:59 -05:00
Antonio Scandurra and Marshall
7d11d8653d
Make Node::context optional as well
...
This was an oversight in f29f81dmarshall@zed.dev >
2023-12-06 18:02:45 +01:00
Antonio Scandurra
a19fc86091
Make more menu-related platform methods no-ops
2023-12-06 17:57:18 +01:00
Antonio Scandurra and Marshall
6ff7f2e035
Add key context to ConversationEditor
...
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-06 17:56:05 +01:00
Marshall Bowers and Antonio
7ef93fefdd
Fix toolbar not appearing for initial pane ( #3512 )
...
This PR fixes an issues where the toolbar would not appear for the
center pane when Zed2 initially loads.
We resolved this by adding a call to initialize the center pane when the
workspace is initialized
Due to changes in the way subscriptions work we can on longer observe an
event that is emitted in the same event cycle in which the subscription
is created.
Because of this we need to explicitly initialize the center pane, as it
won't get performed by the subscription.
Release Notes:
- N/A
---------
Co-authored-by: Antonio <antonio@zed.dev >
2023-12-06 11:54:59 -05:00
Antonio Scandurra
ef56033f7f
Make TestPlatform::set_menus a no-op
2023-12-06 17:45:59 +01:00
Antonio Scandurra and Marshall
f3db0b8e0a
Take a Keymap when setting app menus
...
For a brief period on this branch, we were taking a `DispatchTree`. Doing so
resulted in more accurate key bindings but it meant that we would have had to
recompute the app menus every time the key context changed.
We decided to err on the side of keeping things simple and work in the same
way they worked back in zed1.
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-06 17:26:54 +01:00
Marshall Bowers
2191cb7f3b
Factor out LabelLike to share common label styles ( #3510 )
...
This PR factors out a new `LabelLike` component to share common styles
between the `Label` and `HighlightedLabel` components.
Release Notes:
- N/A
2023-12-06 11:17:12 -05:00
Nate Butler
6625197f45
Merge branch 'main' into update-pickers
2023-12-06 11:10:30 -05:00
Nate Butler
c8572a4b6e
Update file finder style
2023-12-06 11:10:27 -05:00
Nate Butler
7fa50c00ed
Extend ui prelude
2023-12-06 11:07:46 -05:00
Nate Butler
1fbeca9451
WIP update picker style
2023-12-06 11:01:22 -05:00
Piotr Osiewicz and Antonio
225183bae9
Let WindowContext::dispatch_action handle global actions
...
Co-authored-by: Antonio <antonio@zed.dev >
2023-12-06 16:52:52 +01:00
Nate Butler
e35178be27
Merge branch 'main' into update-pickers
2023-12-06 10:48:50 -05:00
Marshall Bowers
f929473b81
Use specified color for non-highlighted text in HighlightedLabel ( #3509 )
...
This PR fixes an issue where the specified color for a
`HighlightedLabel` was not respected as the default color for
non-highlighted text.
Release Notes:
- N/A
2023-12-06 10:41:49 -05:00
Piotr Osiewicz
065df46d32
Merge branch 'main' into app-menus
2023-12-06 16:34:55 +01:00
Antonio Scandurra
df706bd855
WIP
2023-12-06 16:34:07 +01:00
Piotr Osiewicz and Antonio
f29f81df7c
Wire up global actions
...
Added an ephemeral root node so that even if there's no window/focused handle we still have something to dispatch to.
Co-authored-by: Antonio <antonio@zed.dev >
2023-12-06 16:15:53 +01:00
Nate Butler
e0a2b108ca
Add debugging colors to styled_ext
2023-12-06 10:08:26 -05:00
Piotr Osiewicz
aac14f5c41
Merge branch 'main' into copilot2
2023-12-06 15:13:13 +01:00
Antonio Scandurra
4411c839cd
Load assistant panel
2023-12-06 14:23:05 +01:00
Piotr Osiewicz
9e4c4adc51
Remove old UI code, remove dbg!
2023-12-06 14:16:19 +01:00
Piotr Osiewicz
eaeea7d16e
Barebones Copilot prompt
...
Filter out sign in/sign out when user is signed in/not signed in
2023-12-06 14:14:18 +01:00
Piotr Osiewicz
633224ed26
Signed out state is looking good
2023-12-06 13:00:57 +01:00
Antonio Scandurra
c9300e2384
Merge remote-tracking branch 'origin/main' into assistant-2
2023-12-06 12:53:02 +01:00
Antonio Scandurra
2be86deeaf
Start wiring up assistant2
2023-12-06 12:51:25 +01:00
Antonio Scandurra
13b51ae787
WIP
2023-12-06 12:12:28 +01:00
Mikayla
a526002145
Add more debugging
2023-12-05 17:31:33 -08:00
Marshall Bowers
69dd4f50b8
Add missing semicolon
2023-12-05 20:24:43 -05:00
Marshall Bowers
9ecb4b59ae
Wire up NewWindow action
2023-12-05 20:24:01 -05:00
Marshall Bowers
c7a789e1e2
Wire up NewFile action
2023-12-05 20:21:35 -05:00
Mikayla
ea0d8571f9
Add back the main structure
2023-12-05 16:52:29 -08:00
Nathan Sobo
ec8cd7dccb
Merge remote-tracking branch 'origin/main' into app-menus
2023-12-05 16:54:38 -07:00
Nathan Sobo and Marshall
76e6f84910
Merge main
...
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-05 16:47:13 -07:00
Nathan Sobo and Marshall
a209ea2cf9
Get app menus basically working
...
- Everything is still disabled when there is no active window.
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-05 16:37:01 -07:00
0cb43ab7de
Add AppContext::dispatch_action and use it for app menu actions
...
Co-Authored-By: Marshall <marshall@zed.dev >
Co-Authored-By: Julia <julia@zed.dev >
2023-12-05 15:49:06 -07:00
Max Brunsfeld
e903a96401
Implement following and more collaboration panel features in zed2 ( #3504 )
2023-12-05 13:59:15 -08:00
Joseph T. Lyons
5dd0d826c8
temp
2023-12-05 16:37:43 -05:00
Joseph T. Lyons