yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,296 Commits 5 Branches 0 Tags
2fa759e23985e7edf4e97bbe46dcbfb7ca51dd8d
Commit Graph
15296 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Sobo 2fa759e239 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
 2023-12-05 16:52:39 -07:00
Nathan SoboandMarshall 76e6f84910 Merge main 
Co-Authored-By: Marshall <marshall@zed.dev>
 2023-12-05 16:47:13 -07:00
Max Brunsfeld e903a96401 Implement following and more collaboration panel features in zed2 (#3504) 2023-12-05 13:59:15 -08:00
Marshall BowersandNate Butler 4faf00c9f6 Update breadcrumb rendering (#3505) 
This PR updates the rendering of the breadcrumb.

Release Notes:

- N/A

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
 2023-12-05 16:34:21 -05:00
Max Brunsfeld a2f0cffc57 Make Window::on_next_frame work in tests 2023-12-05 13:34:12 -08:00
Max Brunsfeld d03a77bbf4 Get following working 
Restore a single event type on Item trait, so that the workspace can
subscribe to it and handle following events.
 2023-12-05 12:57:23 -08:00
Marshall Bowers 50dc7202fc Update Tab Bar & Toolbar (#3503) 
- Work on default light theme
- Update tab bar and tabs
- Port quick_action_bar crate to zed2
- Add `Indicator` component
- Add `v_stack` & `h_stack` to ui::prelude::*

Release Notes:

- N/A
 2023-12-05 14:23:13 -05:00
Marshall Bowers 1b17e89ef1 Format code 2023-12-05 14:17:22 -05:00
Marshall Bowers 106c479785 Merge branch 'main' into pane-toolbar-tabbar-ui 2023-12-05 14:15:18 -05:00
Nate ButlerandMarshall Bowers 224c6ca1f2 make ci happy 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-05 14:09:42 -05:00
Nate ButlerandMarshall Bowers 461e2c221a Remove debugging colors 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-05 14:09:29 -05:00
Nate ButlerandMarshall Bowers ef129b5512 Update tabs rendering, fix tab spacing bug 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-05 14:04:12 -05:00
Max Brunsfeld 802a517228 Render chat and notes buttons below the current channel 2023-12-05 10:40:51 -08:00
Max Brunsfeld 2461eb0b6f Fix rendering of shared screens in collab panel 2023-12-05 10:29:19 -08:00
Max Brunsfeld 8493032c8a Fix tree branch rendering in collab panel 2023-12-05 10:14:40 -08:00
Nate ButlerandMarshall Bowers 563a34c9f6 Add indicator component 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-05 12:41:54 -05:00
Nate Butler 1a83f0376b Update tab close button 2023-12-05 11:59:23 -05:00
Piotr OsiewiczandNate 508dd48a80 Port quick_action_bar to zed2 
Co-authored-by: Nate <nate@zed.dev>
 2023-12-05 17:33:35 +01:00
Marshall Bowers f18be78ec1 Fix an issue with the text in the theme selector editor not showing (#3501) 
This PR fixes an issues where the text—both placeholder and
user-entered—would not show up in the editor in the theme selector.

It seems to be the min width on the wrapper element that fixes this.

Release Notes:

- N/A
 2023-12-05 10:59:15 -05:00
Piotr Osiewicz 98a55f2636 Add v_stack and h_stack to ui::prelude 2023-12-05 16:48:17 +01:00
Nate Butler a463f6b8a7 Update button sizes 2023-12-05 10:11:18 -05:00
Antonio Scandurra 27fddff40a Port semantic_index to gpui2 (#3500) 
Release Notes:

- N/A
 2023-12-05 15:52:38 +01:00
Antonio ScandurraandJulia Risley e2f77c34f9 Port semantic_index to gpui2 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-12-05 15:38:36 +01:00
Kirill Bulatov 74cadfb2f4 Allow opening files without project entries (#3497) 
Addresses
https://zed-industries.slack.com/archives/C04S5TU0RSN/p1701428432093989
by allowing to open a buffer without a corresponding project `Entry`.
This means that now, we can remove the "fake worktree" requirement and
open files without creating any (the PR does not do this step yet, but
prepares the code for it).

In addition, the PR fixes glob matching code and adds more tests on
excluded files queries.

Release Notes:

- Fixed search query inclusions/exclusions working incorrectly
- Fixed excluded files being opened via CLI and failing or spoiling
project tree view
 2023-12-05 16:33:30 +02:00
Federico Dionisi d9cdd8485a Fix panic opening the theme selector (#3499) 
I noticed a panic when trying to open the theme selector. Removing `Arc`
from `cx.global::<Arc<ThemeRegistry>>()` did the job. Is that the right
way? I'm not sure. 😅

Release Notes:

- N/A
 2023-12-05 15:28:48 +01:00
Kirill Bulatov 5242f8031e Port to gpui2 2023-12-05 16:13:39 +02:00
Federico Dionisi 5a2243aa7a Fix panic opening the theme selector 2023-12-05 15:12:37 +01:00
Nate Butler 761c84d8a5 Update icon size 2023-12-05 09:10:16 -05:00
Nate Butler f723a20bb8 Expand toolbar tools 2023-12-05 09:02:21 -05:00
Piotr Osiewicz f0dcdf9f07 Editor2 tests (#3486) 
Release Notes:

- N/A
 2023-12-05 14:52:20 +01:00
Piotr OsiewiczAntonioKirill
 		8baa4311bf Fix up the inlay_hint_cache proper (document the bug around inserting at inlay hint). 
Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Kirill <kirill@zed.dev>
 2023-12-05 14:10:10 +01:00
Kirill Bulatov 3c3c792750 Fix the test 2023-12-05 12:45:44 +02:00
Kirill Bulatov 51f29faaf3 Add project search in gitignored test 2023-12-05 12:45:44 +02:00
Kirill Bulatov 58264d9c3e Integration tests for excluded files 2023-12-05 12:45:44 +02:00
Kirill Bulatov 0a150c44f2 Fix the regex matcher 2023-12-05 12:45:36 +02:00
Piotr Osiewicz 0f3999d53f Fix up test_lkayout_with_placeholder_text_and_blocks (uncomment last standing assert) 2023-12-05 11:31:17 +01:00
Kirill Bulatov 057bf4e440 Ignore excluded files on worktree entry refresh 2023-12-05 12:30:29 +02:00
Kirill Bulatov 7fd7fdeef6 Allow opening buffers without a project entry 2023-12-05 12:30:29 +02:00
Piotr Osiewicz 0d01d088ef test_layout_with_placeholder_text_and_blocks (incomplete, one assert commented out) 
We need to wire up a field from element state
 2023-12-05 11:28:25 +01:00
Piotr Osiewicz 1bff383bde test_wrapped_invisibles_drawing and test_invisibles_dont_appear_in_certain_editors 2023-12-05 11:11:06 +01:00
Piotr Osiewicz 8420632e71 test_all_invisibles_drawing 2023-12-05 11:09:23 +01:00
Piotr Osiewicz 6e5afcafc9 Fix up test_vim_visual_selections 2023-12-05 10:59:09 +01:00
Piotr Osiewicz debc73d3a1 test_shape_line_numbers 2023-12-05 10:29:09 +01:00
Piotr Osiewicz 5349a1e3ae Fix highlight tests (and a quirky behaviour where the highlights were not dismissed when user clicks on something that's not a brace) 2023-12-05 10:17:27 +01:00
Piotr Osiewicz 0bae30b90e test_copilot_multibuffer 2023-12-05 10:17:27 +01:00
Max Brunsfeld 63fa23813f Enable more collab UI features (#3496) 
* Current Call section of the collab panel
* Improve the collab titlebar
* Add basic UI for following

Following only partially works, but the UI for following is now in
place.
 2023-12-04 18:01:11 -08:00
Max BrunsfeldandNathan c90503de59 Start work on following in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 17:51:53 -08:00
Nate Butler a412df61e0 Remove double first item border in tabs 2023-12-04 20:13:52 -05:00
Max BrunsfeldandNathan da74d47191 Allow joining remote projects in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 17:06:08 -08:00
Max Brunsfeld 42aaec9d32 Revert "Decouple workspace from call (#3380)" 
This reverts commit 2df0a46cbe, reversing
changes made to 2704b92d2e.

Also, adjust new code that was written using the "call handler".
 2023-12-04 17:05:44 -08:00