yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,009 Commits 5 Branches 0 Tags
90d94deaa69e510c3016e18734cfd33fa8b06d34
Commit Graph
25009 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Piotr Osiewicz 2525f9249f Uncomment a bunch of tests in the editor 2023-12-01 18:11:27 +01:00
Julia c4a1527a40 I'm a dunce 2023-12-01 11:47:04 -05:00
Nate Butler 6382cedd6f Collab UI Refinement - Part 1 (#3460) 
[[PR Description]]

Still WIP, merging this to get menu changes in.

Release Notes:

- N/A
 2023-12-01 11:42:31 -05:00
Piotr OsiewiczandAntonio 2f9ce20732 editor tests: Reintroduce block_on_ticks. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-01 17:24:47 +01:00
Piotr Osiewicz 63f1829187 Revert "editor tests: Reintroduce block_on_ticks." 
This reverts commit 80eaa647ce.
 2023-12-01 17:24:20 +01:00
Piotr OsiewiczandAntonio 80eaa647ce editor tests: Reintroduce block_on_ticks. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-01 17:22:12 +01:00
Julia 46e8e35f4d Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00
Nate Butler 26a34fe62f Update collab_titlebar_item.rs 2023-12-01 10:52:11 -05:00
Nate Butler a24d4920fd Merge branch 'main' into collab-ui-refinement 2023-12-01 10:50:25 -05:00
Julia 2d4f00fdf1 Unbreak toolbar layout & improve disabling ButtonLike 2023-12-01 10:33:44 -05:00
Antonio Scandurra 662695ed46 Add mouse context menu to editor2 (#3473) 
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
 2023-12-01 16:25:07 +01:00
Antonio ScandurraandPiotr 1d8623c379 Add mouse context menu to editor2 
Co-Authored-By: Piotr <piotr@zed.dev>
 2023-12-01 16:01:56 +01:00
Antonio Scandurra 09bc268398 Get editor2 mostly to feature-parity with editor (#3472) 
The only missing piece is the context menu, which I'll work on next.

Release Notes:

- N/A
 2023-12-01 14:44:56 +01:00
Antonio Scandurra c195daa651 Respond to modifiers changed event in editor2 and set cursor 2023-12-01 14:26:49 +01:00
Antonio Scandurra 8920271d1b Uncomment git gutter painting 2023-12-01 13:45:14 +01:00
Antonio Scandurra 6effa83e31 Merge remote-tracking branch 'origin/main' into no-more-todos-in-editor 
# Conflicts:
#	crates/editor2/src/items.rs
 2023-12-01 12:40:48 +01:00
Antonio Scandurra 603181a09c Remove all todos in Editor's Item implementation 2023-12-01 12:32:30 +01:00
Antonio Scandurra c29b7af449 Register NewFile and NewFileInDirection from Editor 2023-12-01 12:11:54 +01:00
Antonio Scandurra 422b8559ed Re-enable opening excerpts in Editor 2023-12-01 12:03:21 +01:00
Antonio Scandurra bf5dd7ca97 Re-introduce auto-height in editor2 (#3471) 
Release Notes:

- N/A
 2023-12-01 12:02:45 +01:00
Antonio Scandurra c518916af2 🔥 2023-12-01 11:53:47 +01:00
Antonio Scandurra c113762b6e Delete commented out code for editor element 2023-12-01 11:52:40 +01:00
Antonio Scandurra 9bcaacffbb Remove stray dbg statements 2023-12-01 11:49:25 +01:00
Antonio Scandurra 2fe22af4a3 Fix edits not being reported when rewrapping 2023-12-01 11:48:21 +01:00
Joseph T. Lyons 42d12ef80d Close feedback modal when clicking cancel 2023-11-30 22:07:10 -05:00
Joseph T. Lyons 27215013b2 Fix bug preventing spaces from being used in filename (#3454) 
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)).
 2023-11-30 21:44:48 -05:00
Joseph T. Lyons ca62d0d968 Move project panel's dispatch_context() to render() 2023-11-30 21:37:41 -05:00
Marshall Bowers 16465bb2e9 Respect label_color for Buttons (#3469) 
This PR makes `Button`s respect the `label_color` that is specified,
provided they are not disabled or selected.

Release Notes:

- N/A
 2023-11-30 20:36:59 -05:00
Conrad Irwin f5df100bff Show cursor position in status bar (#3464) 
Passes the compiler so it must work!

(though it doesn't show up until we fix pane focus)

Release Notes:

- N/A
 2023-11-30 16:40:42 -07:00
Conrad Irwin f139380986 Rename menu_handle to right_click_menu and child to trigger 
This makes things more in-line with `popover_menu`.
 2023-11-30 16:39:43 -07:00
Max Brunsfeld 51003e46ff Restore some workspace functionality, enable workspace tests (#3468) 
* Pane history navigation
* Autosave on focus change
* Setting the window title based on the active path
 2023-11-30 15:26:44 -08:00
Conrad Irwin c948ffad89 Flesh out a popover control 2023-11-30 16:13:44 -07:00
Max Brunsfeld 04bf9ee4c8 Re-introduce active path tracking in workspace 2023-11-30 14:58:14 -08:00
Max Brunsfeld bcc72567bc Restore auto-save on focus change, re-enable workspace tests 2023-11-30 14:45:27 -08:00
Nate Butler 63ac9de628 Add some text to clarify no api key state (#3462) 
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
 2023-11-30 17:26:50 -05:00
Nate ButlerandJoseph T. Lyons c94d864067 Update feedback modal UI 
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
 2023-11-30 16:42:58 -05:00
Nate ButlerJoseph T. LyonsConrad Irwin
 		8580f27eed Get feedback2 compiling 
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-11-30 16:07:54 -05:00
Marshall Bowers 70e0762838 Rework ListHeader to be more open (#3467) 
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
 2023-11-30 15:55:31 -05:00
Nate ButlerJoseph T. LyonsConrad Irwin
 		a2e46e99fd Add v_stack and h_stack to the UI prelude 
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-11-30 15:28:18 -05:00
Nate ButlerJoseph T. LyonsConrad Irwin
 		b7b137759f init feedback2 
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-11-30 15:23:42 -05:00
Max Brunsfeld c3fa429b1d Reintroduce pane navigation history in zed2 2023-11-30 12:10:25 -08:00
Nate Butler 4a4298df17 Update collab_titlebar_item.rs 2023-11-30 14:55:59 -05:00
Nate Butler 0a836c7934 WIP update popover_menu 2023-11-30 14:54:44 -05:00
Max Brunsfeld 4ca67911a6 Bump Tree-sitter to fix another crash triggered by a markdown file (#3466) 
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.
 2023-11-30 11:46:00 -08:00
Max Brunsfeld 2cb5a395e2 Bump Tree-sitter for a crash fix 2023-11-30 11:36:36 -08:00
Joseph T. LyonsandMikayla Maki 391e43f47f Fix bug preventing spaces from being used in filename (zed2) 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-11-30 14:24:00 -05:00
Mikayla 132385aee8 WIP: layout compiling 2023-11-30 11:01:36 -08:00
JuliaandConrad Irwin 8c4ba5a0ae Pane context menus & focus shenanigans 
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
 2023-11-30 14:01:09 -05:00
Marshall Bowers a2d76644cd Implement Selectable for list components (#3465) 
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
 2023-11-30 13:37:29 -05:00
Marshall Bowers b2f481567f Implement Selectable for ListItem and ListHeader 2023-11-30 13:26:12 -05:00