Antonio Scandurra
9eb98122ec
Merge remote-tracking branch 'origin/main' into assistant-2
2023-12-06 12:53:02 +01:00
Antonio Scandurra
1de02cf6e5
Start wiring up assistant2
2023-12-06 12:51:25 +01:00
Antonio Scandurra
b29cea287b
WIP
2023-12-06 12:12:28 +01:00
Nathan Sobo
c9dd6b879c
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 Sobo and Marshall
65bb05af4c
Merge main
...
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-05 16:47:13 -07:00
Max Brunsfeld
5b6fd3ac1d
Implement following and more collaboration panel features in zed2 ( #3504 )
2023-12-05 13:59:15 -08:00
Marshall Bowers and Nate Butler
02e507b973
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
f2faa70f73
Make Window::on_next_frame work in tests
2023-12-05 13:34:12 -08:00
Max Brunsfeld
863222edc5
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
fc9b662042
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
8141f4fd86
Format code
2023-12-05 14:17:22 -05:00
Marshall Bowers
e0ca7f844a
Merge branch 'main' into pane-toolbar-tabbar-ui
2023-12-05 14:15:18 -05:00
Nate Butler and Marshall Bowers
4c4b235b13
make ci happy
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-12-05 14:09:42 -05:00
Nate Butler and Marshall Bowers
dc7e4a4b17
Remove debugging colors
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-12-05 14:09:29 -05:00
Nate Butler and Marshall Bowers
27703a3279
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
7b4b068230
Render chat and notes buttons below the current channel
2023-12-05 10:40:51 -08:00
Max Brunsfeld
38d41acf9b
Fix rendering of shared screens in collab panel
2023-12-05 10:29:19 -08:00
Antonio Scandurra
d86da04584
WIP
2023-12-05 19:27:15 +01:00
Max Brunsfeld
5e79807f6f
Fix tree branch rendering in collab panel
2023-12-05 10:14:40 -08:00
Nate Butler and Marshall Bowers
dccdcd3221
Add indicator component
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-12-05 12:41:54 -05:00
Antonio Scandurra
e534c5fdcd
WIP
2023-12-05 18:14:24 +01:00
Nate Butler
eed5a698cf
Update tab close button
2023-12-05 11:59:23 -05:00
Piotr Osiewicz and Nate
412c6157b1
Port quick_action_bar to zed2
...
Co-authored-by: Nate <nate@zed.dev >
2023-12-05 17:33:35 +01:00
Marshall Bowers
2299730538
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
Antonio Scandurra
ede86d9187
WIP
2023-12-05 16:49:36 +01:00
Piotr Osiewicz
c9b50c8bab
Add v_stack and h_stack to ui::prelude
2023-12-05 16:48:17 +01:00
Nate Butler
7c5df51d2e
Update button sizes
2023-12-05 10:11:18 -05:00
Antonio Scandurra
30725d6a17
Port semantic_index to gpui2 ( #3500 )
...
Release Notes:
- N/A
2023-12-05 15:52:38 +01:00
Antonio Scandurra and Julia Risley
09db455db2
Port semantic_index to gpui2
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-12-05 15:38:36 +01:00
Kirill Bulatov
c2d3e74ffb
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
62bfa3b452
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
16b5d4b35c
Port to gpui2
2023-12-05 16:13:39 +02:00
Federico Dionisi
20352c51c1
Fix panic opening the theme selector
2023-12-05 15:12:37 +01:00
Nate Butler
f9efaebddf
Update icon size
2023-12-05 09:10:16 -05:00
Nate Butler
af72772a72
Expand toolbar tools
2023-12-05 09:02:21 -05:00
Piotr Osiewicz
d433da1e70
Editor2 tests ( #3486 )
...
Release Notes:
- N/A
2023-12-05 14:52:20 +01:00
001ce47a0c
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
e5616bce98
Fix the test
2023-12-05 12:45:44 +02:00
Kirill Bulatov
92fbdb429c
Add project search in gitignored test
2023-12-05 12:45:44 +02:00
Kirill Bulatov
b43dc480a9
Integration tests for excluded files
2023-12-05 12:45:44 +02:00
Kirill Bulatov
2c2c14a360
Fix the regex matcher
2023-12-05 12:45:36 +02:00
Piotr Osiewicz
dffe323e73
Fix up test_lkayout_with_placeholder_text_and_blocks (uncomment last standing assert)
2023-12-05 11:31:17 +01:00
Kirill Bulatov
f0ca7141b8
Ignore excluded files on worktree entry refresh
2023-12-05 12:30:29 +02:00
Kirill Bulatov
1f6c69c7dc
Allow opening buffers without a project entry
2023-12-05 12:30:29 +02:00
Piotr Osiewicz
590238bcca
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
caa5fccbc4
test_wrapped_invisibles_drawing and test_invisibles_dont_appear_in_certain_editors
2023-12-05 11:11:06 +01:00
Piotr Osiewicz
1dd6625dd4
test_all_invisibles_drawing
2023-12-05 11:09:23 +01:00
Piotr Osiewicz
ee695bbb34
Fix up test_vim_visual_selections
2023-12-05 10:59:09 +01:00
Piotr Osiewicz
9695ea1017
test_shape_line_numbers
2023-12-05 10:29:09 +01:00
Piotr Osiewicz
e0ec5032e9
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
Antonio Scandurra