13f4cc5
Merge branch 'main' into zed2-breadcrumbs
Julia created
Commit log
ab75dbe
Update collab_titlebar_item.rs
Nate Butler created
88188b0
Merge branch 'main' into collab-ui-refinement
Nate Butler created
ce16e5b
Unbreak toolbar layout & improve disabling ButtonLike
Julia created
134f3eb
Add mouse context menu to `editor2` (#3473)
Click to expand commit body
We observed some weird behavior in `ContextMenu`, specifically: - It seems like we don't intercept actions that have been dispatched, which causes the context menu to stay open. - The key bindings for editor actions in the context menu seem to come from Vim Release Notes: - N/A
Antonio Scandurra created
5fefc12
Add mouse context menu to `editor2`
Click to expand commit body
Co-Authored-By: Piotr <piotr@zed.dev>
Antonio Scandurra and Piotr created
9fedb4c
Get `editor2` mostly to feature-parity with `editor` (#3472)
Click to expand commit body
The only missing piece is the context menu, which I'll work on next. Release Notes: - N/A
Antonio Scandurra created
f0c205b
Respond to modifiers changed event in editor2 and set cursor
Antonio Scandurra created
f0bc4a0
Uncomment git gutter painting
Antonio Scandurra created
1abc876
Merge remote-tracking branch 'origin/main' into no-more-todos-in-editor
Click to expand commit body
# Conflicts: # crates/editor2/src/items.rs
Antonio Scandurra created
8e4f2fb
Remove all todos in Editor's Item implementation
Antonio Scandurra created
faa8963
Register NewFile and NewFileInDirection from Editor
Antonio Scandurra created
a8a5785
Re-enable opening excerpts in Editor
Antonio Scandurra created
c9be637
Re-introduce auto-height in `editor2` (#3471)
Click to expand commit body
Release Notes: - N/A
Antonio Scandurra created
0b7e324
:fire:
Antonio Scandurra created
8c59a2d
Delete commented out code for editor element
Antonio Scandurra created
21d3ae6
Remove stray dbg statements
Antonio Scandurra created
1b07fd6
Fix edits not being reported when rewrapping
Antonio Scandurra created
a75f1a4
Close feedback modal when clicking cancel
Joseph T. Lyons created
eef6c37
Fix bug preventing spaces from being used in filename (#3454)
Click to expand commit body
This bug was my fault, something I changed months ago to be more consistent with VS Code - really strange that it took months for someone to find out spaces couldn't be used in the project panel. ~I didn't apply this fix to zed2 because I dont think the facilities are in place to do so (@maxbrunsfeld, @mikayla-maki, is there a system in place for this that I missed?). I did leave a TODO.~ Fix is now in zed 2. Release Notes: - Fixed a bug where spaces could not be inserted when editing file names in the project panel ([#2308](https://github.com/zed-industries/community/issues/2308)).
Joseph T. Lyons created
9849a0a
Move project panel's dispatch_context() to render()
Joseph T. Lyons created
6d62e6c
Respect `label_color` for `Button`s (#3469)
Click to expand commit body
This PR makes `Button`s respect the `label_color` that is specified, provided they are not disabled or selected. Release Notes: - N/A
Marshall Bowers created
0441b48
Show cursor position in status bar (#3464)
Click to expand commit body
Passes the compiler so it must work! (though it doesn't show up until we fix pane focus) Release Notes: - N/A
Conrad Irwin created
e1c8369
Rename `menu_handle` to `right_click_menu` and `child` to `trigger`
Click to expand commit body
This makes things more in-line with `popover_menu`.
Conrad Irwin created
4f74d65
Restore some workspace functionality, enable workspace tests (#3468)
Click to expand commit body
* Pane history navigation * Autosave on focus change * Setting the window title based on the active path
Max Brunsfeld created
ebbbeca
Flesh out a popover control
Conrad Irwin created
cb11c12
Re-introduce active path tracking in workspace
Max Brunsfeld created
a003a91
Restore auto-save on focus change, re-enable workspace tests
Max Brunsfeld created
bac39e8
Add some text to clarify no api key state (#3462)
Click to expand commit body
This PR is a quick-and-dirty approach to clarify what is happening when a user doesn't have an API key so the assistant opens with the key editor. - Adds some text explaining how to close the panel - Explains that other subscriptions don't cover the assistant, it needs an api key. - Helps people understand where to go to get an API key. This is a Zed 1 change only, a bandaid. Zed 2 will have a better solution: [Working issue](https://github.com/zed-industries/zed/issues/3461) Release Notes: - N/A
Nate Butler created
e228422
Update feedback modal UI
Click to expand commit body
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
Nate Butler and Joseph T. Lyons created
8b7be8f
Get `feedback2` compiling
Click to expand commit body
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com> Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
Nate Butler , Joseph T. Lyons , and Conrad Irwin created
e5a5b1e
Rework `ListHeader` to be more open (#3467)
Click to expand commit body
This PR reworks the `ListHeader` component to be more open. The `meta` method can now be used to append meta items of any element to the `ListHeader`, and they will be rendered with the appropriate spacing between them. Release Notes: - N/A
Marshall Bowers created
5098faf
Add `v_stack` and `h_stack` to the UI prelude
Click to expand commit body
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com> Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
Nate Butler , Joseph T. Lyons , and Conrad Irwin created
f987a64
init feedback2
Click to expand commit body
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com> Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
Nate Butler , Joseph T. Lyons , and Conrad Irwin created
c63ca09
Reintroduce pane navigation history in zed2
Max Brunsfeld created
164084c
Update collab_titlebar_item.rs
Nate Butler created
180ba42
WIP update popover_menu
Nate Butler created
bd6fa66
Bump Tree-sitter to fix another crash triggered by a markdown file (#3466)
Click to expand commit body
Bumps Tree-sitter for https://github.com/tree-sitter/tree-sitter/pull/2802 This fixes a regression introduced in the last Tree-sitter upgrade. Release Notes: - Fixed a crash that occurred when editing certain Markdown files.
Max Brunsfeld created
16dc978
Bump Tree-sitter for a crash fix
Max Brunsfeld created
f922ad9
Fix bug preventing spaces from being used in filename (zed2)
Click to expand commit body
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
Joseph T. Lyons and Mikayla Maki created
39887be
WIP: layout compiling
Mikayla created
d516ae0
Pane context menus & focus shenanigans
Click to expand commit body
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
Julia and Conrad Irwin created
3ffcb97
Implement `Selectable` for list components (#3465)
Click to expand commit body
This PR implements the `Selectable` trait for the `ListItem` and `ListHeader` components. These components already had their own selectable behavior, but weren't formally adhering to the interface defined by the trait. Release Notes: - N/A
Marshall Bowers created
e78538e
Implement `Selectable` for `ListItem` and `ListHeader`
Marshall Bowers created
865baaa
Remove unused `GraphicSlot` enum
Marshall Bowers created
5fdfdb0
Remove unused import
Nate Butler created
5eb8978
Clean up left side titlebar buttons
Nate Butler created
b34b197
Update main.rs
Mikayla Maki created
679851e
Add `render_project_name` and `render_project_branch`
Click to expand commit body
Co-Authored-By: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Nate Butler and Piotr Osiewicz created
8d4652a
Scaffold out `render_project_owner`
Click to expand commit body
Co-Authored-By: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Nate Butler and Piotr Osiewicz created