mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-08 18:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
15481 commits 785 branches 806 tags 234 MiB
Commit graph

350 commits

Author SHA1 Message Date
Conrad Irwin
32837d67be vim2 compiling (but mostly commented out) 2023-12-08 18:47:14 +00:00
Antonio Scandurra
7842fdeb32 Fix confirming rename not working on editor2 2023-12-07 12:54:28 +01:00
Joseph T. Lyons
2a68a6171a
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
d2362d7f12 Merge branch 'main' into feedback-2 2023-12-06 23:16:54 -05:00
Mikayla
fd31e429f5
Merge branch 'main' into terminal-element 2023-12-06 15:20:04 -08:00
Mikayla
12e7f61f62
Fix a porting bugs for terminal2 
co-authored-by: Nathan <nathan@zed.dev>
 2023-12-06 15:11:49 -08:00
Joseph T. Lyons
46c998ca8d WIP 2023-12-06 17:27:10 -05:00
Max Brunsfeld
89c8a7c242 Enable buffer font size adjustment in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-06 13:52:33 -08:00
Kirill Bulatov
5644815c4c Use a better name for zed2 inlay style field 2023-12-06 22:06:30 +02:00
Kirill Bulatov
ec798e6574
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">


![image](https://github.com/zed-industries/zed/assets/2690773/8434d8a1-ee7e-49c1-9e88-362363225d96)

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
d7473ad6e7
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
f76e1cfd91 Pass proper theme colors for inlays and suggestions 2023-12-06 21:48:39 +02:00
Nathan Sobo
ac07e230fa Document geometry 2023-12-06 12:28:44 -07:00
Joseph T. Lyons
4863c9ac25 WIP 2023-12-06 14:13:44 -05:00
Antonio Scandurra
7e2ff63270 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
14def2a1a3 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
7c9e2f6b7d
Introduce app menus in zed2 (#3511) 
Release Notes:

- N/A
 2023-12-06 18:17:02 +01:00
Marshall Bowers
8f1c74b8bc
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
e9002ab10a Merge branch 'main' into app-menus 2023-12-06 16:34:55 +01:00
Piotr Osiewicz
d09dfe01f5 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
9eb98122ec Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Marshall Bowers
5660c8f655 Add missing semicolon 2023-12-05 20:24:43 -05:00
Marshall Bowers
ed31d36ac1 Wire up NewWindow action 2023-12-05 20:24:01 -05:00
Marshall Bowers
d8757845a9 Wire up NewFile action 2023-12-05 20:21:35 -05:00
Nathan Sobo
d2fe9f8f9b Merge remote-tracking branch 'origin/main' into app-menus 2023-12-05 16:54:38 -07:00
Nathan Sobo
82534b6612 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
5b6fd3ac1d
Implement following and more collaboration panel features in zed2 (#3504) 2023-12-05 13:59:15 -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
e0ca7f844a Merge branch 'main' into pane-toolbar-tabbar-ui 2023-12-05 14:15:18 -05:00
Nate Butler
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
Antonio Scandurra
d86da04584 WIP 2023-12-05 19:27:15 +01:00
Mikayla
8d57d6ca6f
Merge branch 'main' into terminal-element 2023-12-05 09:33:46 -08:00
Piotr Osiewicz
d433da1e70
Editor2 tests (#3486) 
Release Notes:

- N/A
 2023-12-05 14:52:20 +01:00
Piotr Osiewicz
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
Piotr Osiewicz
dffe323e73 Fix up test_lkayout_with_placeholder_text_and_blocks (uncomment last standing assert) 2023-12-05 11:31:17 +01: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
Piotr Osiewicz
948c065f86 test_copilot_multibuffer 2023-12-05 10:17:27 +01:00
Max Brunsfeld
ae6ddceb67
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
63667ecf6f 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
1c9b984738 Remove cx param 2023-12-04 23:35:31 +00:00
Conrad Irwin
c82fea375d Dispatch actions on focused node 
Allows us to implement context menu matching nicely
 2023-12-04 22:58:04 +00:00
Marshall Bowers
4cb4033a36 Merge branch 'main' into editor2_tests 2023-12-04 14:09:23 -05:00
Marshall Bowers
b212aab00d
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
a3e4559b0e Fix git test compilation 2023-12-04 17:57:43 +01:00
Marshall Bowers
26c797c358 Format code 2023-12-04 11:57:10 -05:00