Antonio Scandurra
67a00e0920
Fix confirming rename not working on editor2
2023-12-07 12:54:28 +01:00
Joseph T. Lyons
df84b9d94e
Remove remnants from conflict resolution ( #3528 )
...
Fixes a couple of things that slipped through when going through the
last merge conflict
Release Notes:
- N/A
2023-12-06 23:44:49 -05:00
Joseph T. Lyons
263b79c047
Merge branch 'main' into feedback-2
2023-12-06 23:16:54 -05:00
Mikayla
8d491f7e44
Merge branch 'main' into terminal-element
2023-12-06 15:20:04 -08:00
Mikayla and Nathan
b945e33e53
Fix a porting bugs for terminal2
...
co-authored-by: Nathan <nathan@zed.dev >
2023-12-06 15:11:49 -08:00
Joseph T. Lyons
a364c9ed70
WIP
2023-12-06 17:27:10 -05:00
Max Brunsfeld and Nathan
5392e6ca24
Enable buffer font size adjustment in zed2
...
Co-authored-by: Nathan <nathan@zed.dev >
2023-12-06 13:52:33 -08:00
Kirill Bulatov
15bdf7622d
Use a better name for zed2 inlay style field
2023-12-06 22:06:30 +02:00
Kirill Bulatov
98a9733d16
Pass proper theme colors for inlays and suggestions ( #3517 )
...
<img width="1728" alt="image"
src="https://github.com/zed-industries/zed/assets/2690773/f6f1e24f-71fe-4a2e-9bcf-9e98861c0da4 ">
Now inlays are visible in all zed2 themes, but
* always have a blue color which is the same as some theme colors
* not other hint-related style changes like font width, background, etc.
seem to exist in the theme, ergo not propagated.
In general though, people want those style changes applied to their
hints, so we might want to do something about it later.
I've left a `// todo!("what about the rest of the highlight style parts
for inlays and suggestions?")` in the corresponding places for that.
Release Notes:
- N/A
2023-12-06 21:54:41 +02:00
Nathan Sobo
8b0a073611
Document geometry module and replace zero method with default ( #3515 )
...
Nothing earth-shattering here, but all our geometry types are now fully
documented.
Release Notes:
- N/A
2023-12-06 12:52:41 -07:00
Kirill Bulatov
c5bcd65546
Pass proper theme colors for inlays and suggestions
2023-12-06 21:48:39 +02:00
Nathan Sobo
09b6840b92
Document geometry
2023-12-06 12:28:44 -07:00
Joseph T. Lyons
c6e2d20500
WIP
2023-12-06 14:13:44 -05:00
Antonio Scandurra and Marshall
a82902714b
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 >
2023-12-06 19:15:09 +01:00
Antonio Scandurra
c62305edea
Merge remote-tracking branch 'origin/main' into assistant-2
...
# Conflicts:
# crates/ui2/src/components/icon.rs
2023-12-06 18:18:58 +01:00
Antonio Scandurra
f5edae4353
Introduce app menus in zed2 ( #3511 )
...
Release Notes:
- N/A
2023-12-06 18:17:02 +01:00
Marshall Bowers
2191cb7f3b
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
2023-12-06 11:17:12 -05:00
Piotr Osiewicz
065df46d32
Merge branch 'main' into app-menus
2023-12-06 16:34:55 +01:00
Piotr Osiewicz and Antonio
f29f81df7c
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 >
2023-12-06 16:15:53 +01:00
Antonio Scandurra
c9300e2384
Merge remote-tracking branch 'origin/main' into assistant-2
2023-12-06 12:53:02 +01:00
Marshall Bowers
69dd4f50b8
Add missing semicolon
2023-12-05 20:24:43 -05:00
Marshall Bowers
9ecb4b59ae
Wire up NewWindow action
2023-12-05 20:24:01 -05:00
Marshall Bowers
c7a789e1e2
Wire up NewFile action
2023-12-05 20:21:35 -05:00
Nathan Sobo
ec8cd7dccb
Merge remote-tracking branch 'origin/main' into app-menus
2023-12-05 16:54:38 -07:00
Nathan Sobo and Marshall
a209ea2cf9
Get app menus basically working
...
- Everything is still disabled when there is no active window.
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-05 16:37:01 -07:00
Max Brunsfeld
e903a96401
Implement following and more collaboration panel features in zed2 ( #3504 )
2023-12-05 13:59:15 -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
106c479785
Merge branch 'main' into pane-toolbar-tabbar-ui
2023-12-05 14:15:18 -05:00
Nate Butler and Marshall 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
Antonio Scandurra
50ff26b06d
WIP
2023-12-05 19:27:15 +01:00
Mikayla
abe83c8b69
Merge branch 'main' into terminal-element
2023-12-05 09:33:46 -08:00
Piotr Osiewicz
f0dcdf9f07
Editor2 tests ( #3486 )
...
Release Notes:
- N/A
2023-12-05 14:52:20 +01:00
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
Piotr Osiewicz
0f3999d53f
Fix up test_lkayout_with_placeholder_text_and_blocks (uncomment last standing assert)
2023-12-05 11:31:17 +01: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 Brunsfeld and Nathan
debcb52436
Start bringing back the current call section of the collab panel
...
Co-authored-by: Nathan <nathan@zed.dev >
2023-12-04 15:46:56 -08:00
Conrad Irwin
1f7391fd60
Remove cx param
2023-12-04 23:35:31 +00:00
Conrad Irwin
a3ea5a944e
Dispatch actions on focused node
...
Allows us to implement context menu matching nicely
2023-12-04 22:58:04 +00:00
Marshall Bowers
886f309729
Merge branch 'main' into editor2_tests
2023-12-04 14:09:23 -05:00
Marshall Bowers
38c7241da1
Add support for copying diagnostic messages to the clipboard ( #3489 )
...
This PR adds support for copying diagnostics messages to the clipboard.
This was already working, but we were missing implementations
clipboard-related methods in the `TestPlatform` that were causing the
tests to fail when the copying functionality was added.
Release Notes:
- N/A
2023-12-04 14:08:05 -05:00
Piotr Osiewicz
071aa38f4b
Fix git test compilation
2023-12-04 17:57:43 +01:00
Marshall Bowers
1172e4c84b
Format code
2023-12-04 11:57:10 -05:00
Marshall Bowers
9d6a58fdd1
Merge branch 'main' into diagnostics-style-2
2023-12-04 11:56:55 -05:00
Antonio Scandurra