02a6a2e
Revert "Delete feedback_modal.rs"
Click to expand commit body
This reverts commit eff925cb6a37df6eab2253c4a6904b51e118a224.
Joseph T. Lyons created
02a6a2e
Revert "Delete feedback_modal.rs"
This reverts commit eff925cb6a37df6eab2253c4a6904b51e118a224.
Joseph T. Lyons created
4863c9a
WIP
Joseph T. Lyons created
2c350a7
Port `assistant` crate to Zed2 (#3513)
This PR contains the initial port of the `assistant` crate to Zed2. Release Notes: - N/A
Marshall Bowers created
fdd6483
Update inline assist styles
Marshall Bowers created
eff925c
Delete feedback_modal.rs
Joseph T. Lyons created
7e2ff63
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>
Antonio Scandurra and Marshall created
cc9eff8
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>
Antonio Scandurra and Marshall created
e4884f1
Move assistant actions to the top of the crate
Co-Authored-By: Marshall <marshall@zed.dev>
Antonio Scandurra and Marshall created
02e7a06
Merge branch 'main' of https://github.com/zed-industries/zed
Joseph T. Lyons created
5ae2060
collab 0.30.0
Joseph T. Lyons created
14def2a
Merge remote-tracking branch 'origin/main' into assistant-2
# Conflicts: # crates/ui2/src/components/icon.rs
Antonio Scandurra created
7c9e2f6
Introduce app menus in `zed2` (#3511)
Release Notes: - N/A
Antonio Scandurra created
f6a7a6c
v0.117.x dev
Marshall Bowers created
2aee3e3
Make `Node::context` optional as well
This was an oversight in d09dfe0. Co-Authored-By: Marshall <marshall@zed.dev>
Antonio Scandurra and Marshall created
5e558e2
Make more menu-related platform methods no-ops
Antonio Scandurra created
80f3151
Add key context to ConversationEditor
Co-Authored-By: Marshall <marshall@zed.dev>
Antonio Scandurra and Marshall created
80c8fd1
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>
Marshall Bowers and Antonio created
886ec79
Make TestPlatform::set_menus a no-op
Antonio Scandurra created
c8ddc95
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>
Antonio Scandurra and Marshall created
8f1c74b
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
Marshall Bowers created
0ced310
Merge branch 'main' into update-pickers
Nate Butler created
74e3b12
Update file finder style
Nate Butler created
cf971f7
Extend ui prelude
Nate Butler created
b5c790e
WIP update picker style
Nate Butler created
6549a9a
Let WindowContext::dispatch_action handle global actions
Co-authored-by: Antonio <antonio@zed.dev>
Piotr Osiewicz and Antonio created
3b8c566
Merge branch 'main' into update-pickers
Nate Butler created
f833cd7
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
Marshall Bowers created
e9002ab
Merge branch 'main' into app-menus
Piotr Osiewicz created
a1c8f01
WIP
Antonio Scandurra created
54ea725
Copilot2 (#3498)
Add hidden_action_types to CommandPaletteFilter. WindowContext.available_actions now returns global actions as well. Release Notes: - N/A
Antonio Scandurra created
d09dfe0
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>
Piotr Osiewicz and Antonio created
3c1bf02
Disable bundling for `main` commits (#3508)
(in the first commit, this PR autoformats both yaml files with Zed's default prettier, to be able to edit those in prettier from now on) Bundling is a relatively long procedure, and now we have nightly builds for zed2 (with their own lifecycle, CI file and tag for triggering it from non-main branch). Hence, bundling zed1 and/or zed2 by default looks wasteful and unnecessary, disable them by default. There's still a `run-build-dmg` label that enables bundling for any PR needed, and a `startsWith(github.ref, 'refs/tags/v')` check in the CI run to keep the releases working. Release Notes: - N/A
Kirill Bulatov created
cb0880c
Add debugging colors to styled_ext
Nate Butler created
a58f393
Do not bundle Zed on `main` branch commits
Kirill Bulatov created
0ef97ed
Format the CI file with Zed's default prettier
Kirill Bulatov created
1f538c5
Merge branch 'main' into copilot2
Piotr Osiewicz created
5f172a5
Load assistant panel
Antonio Scandurra created
1b0ec82
Remove old UI code, remove dbg!
Piotr Osiewicz created
7998e82
Barebones Copilot prompt
Filter out sign in/sign out when user is signed in/not signed in
Piotr Osiewicz created
3f9fe58
Signed out state is looking good
Piotr Osiewicz created
9eb9812
Merge remote-tracking branch 'origin/main' into assistant-2
Antonio Scandurra created
1de02cf
Start wiring up assistant2
Antonio Scandurra created
b29cea2
WIP
Antonio Scandurra created
735f202
Add more debugging
Mikayla created
5660c8f
Add missing semicolon
Marshall Bowers created
ed31d36
Wire up `NewWindow` action
Marshall Bowers created
d875784
Wire up `NewFile` action
Marshall Bowers created
2ee0ecb
Add back the main structure
Mikayla created
d2fe9f8
Merge remote-tracking branch 'origin/main' into app-menus
Nathan Sobo created
c9dd6b8
Fix cmd-n in the project panel context menu and bind global workspace actions (#3491)
This PR binds the `workspace::NewFile` action only in the `Workspace` context. It previously was bound globally, which caused us to hijack the `cmd-n` binding when the context menu was visible in the project panel. In the process, we also added some other global workspace actions and move some other global bindings to be bound only on `Pane` and `Workspace`. Release Notes: - N/A
Nathan Sobo created