Commit Graph
364 Commits
Author SHA1 Message Date
Piotr Osiewicz ba57516632 Merge branch 'main' into project_search2 2023-12-11 16:47:48 +01:00
Antonio Scandurra 0d2780b508 Fix porting mistake that caused clicking on the editor to misbehave
We used `width` instead of `height` in the "pixels-to-point" conversion
code, which would cause clicks to not work correctly when the width was
smaller than the `y` coordinate.
2023-12-11 14:21:55 +01:00
Kirill Bulatov 42acd6431f Finalize the command 2023-12-11 12:28:22 +02:00
Kirill Bulatov 50e2f5c886 Draft an expand macro recusively command 2023-12-11 12:28:22 +02:00
Antonio Scandurra 135c16c158 Listen for mouse events on scrollbar 2023-12-11 10:33:05 +01:00
Antonio Scandurra 5eec1221cb Merge remote-tracking branch 'origin/main' into scrollbars2 2023-12-11 09:51:43 +01:00
Conrad Irwin 44a660dc78 actions3 (#3578)
- Restore impl_actions! and remove derive(Action)

Originally in gpui2 we inferred the action's namespace from the module
it was
defined in. This worked most of the time (ignoring the "remove_the_2"
hack),
but caused unintended (and mostly invisible) behavior in crates with
multiple
modules.

#3577 restored the namespace parameter to actions!, and this PR
reintroduces
`impl_actions!` to do the same for non-unit structs.

I considered trying to keep the struct-attribute API work, because it
does feel
more stylistically appropriate for rust, but two problems lead to it
feeling less good than `impl_actions!` in practice:
1. You have to repeat the namespace for each struct (and usually you're
defining them all in the same namespace)
2. You can't pass an argument to a derive macro inline, you need to use
an attribute instead.


Release Notes:

- N/A
2023-12-10 19:59:53 -07:00
Conrad Irwin aed17f4763 Restore impl_actions! and remove derive(Action) 2023-12-10 19:33:38 -07:00
Conrad Irwin 9761adb159 Restore namespace parameter to actions! (#3577)
This does not yet fix `derive(Action)`, but will conflict with a lot so
wanted to merge quickly.

Although automatically deriving the namespace worked in many situations,
it was
unclear what to do with nested modules. Vim wanted all actions to be
registered
under vim, while collab_ui wanted one namespace per action.

It seems better to make the implicit explicit, and give the flexibility
to hide
implementation details from the end-users.

Release Notes:

- N/A
2023-12-09 15:27:17 -07:00
Conrad Irwin 9befa3f9ca Restore namespace parameter to actions!
This does not yet fix `derive(Action)`, but will conflict with a lot so
wanted to merge quickly.
2023-12-09 15:18:31 -07:00
Max Brunsfeld b72f66fae8 Paint code-action/fold buttons above the gutter 2023-12-09 11:41:40 -08:00
Marshall Bowers a8c4edf312 Use the diff status colors defined in the theme (#3569)
This PR updates the diff status colors to use the ones defined in the
theme instead of placeholder colors.

Release Notes:

- N/A
2023-12-08 17:41:11 -05:00
Antonio Scandurra cb29eb0fea 🎨 2023-12-08 14:24:58 +01:00
Antonio Scandurra e759da1480 Paint scrollbars
We still need to wire up mouse listeners.
2023-12-08 14:17:38 +01:00
Piotr Osiewicz 95814ab53b Barebones project search (no UI, but the crate compiles) 2023-12-07 14:36:45 +01:00
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
MikaylaandNathan 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 BrunsfeldandNathan 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">


![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 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 ScandurraandMarshall 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 OsiewiczandAntonio 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 SoboandMarshall 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 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
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