Julia
13f4cc563c
Merge branch 'main' into zed2-breadcrumbs
2023-12-01 11:02:34 -05:00
Antonio Scandurra
5fefc121bf
Add mouse context menu to editor2
...
Co-Authored-By: Piotr <piotr@zed.dev>
2023-12-01 16:01:56 +01:00
Antonio Scandurra
f0c205be5d
Respond to modifiers changed event in editor2 and set cursor
2023-12-01 14:26:49 +01:00
Antonio Scandurra
f0bc4a04bd
Uncomment git gutter painting
2023-12-01 13:45:14 +01:00
Antonio Scandurra
1abc876c15
Merge remote-tracking branch 'origin/main' into no-more-todos-in-editor
...
# Conflicts:
# crates/editor2/src/items.rs
2023-12-01 12:40:48 +01:00
Antonio Scandurra
8e4f2fb25a
Remove all todos in Editor's Item implementation
2023-12-01 12:32:30 +01:00
Antonio Scandurra
faa896343b
Register NewFile and NewFileInDirection from Editor
2023-12-01 12:11:54 +01:00
Antonio Scandurra
a8a5785ec5
Re-enable opening excerpts in Editor
2023-12-01 12:03:21 +01:00
Antonio Scandurra
c9be637b6b
Re-introduce auto-height in editor2 ( #3471 )
...
Release Notes:
- N/A
2023-12-01 12:02:45 +01:00
Antonio Scandurra
0b7e324d86
🔥
2023-12-01 11:53:47 +01:00
Antonio Scandurra
8c59a2d2c0
Delete commented out code for editor element
2023-12-01 11:52:40 +01:00
Antonio Scandurra
21d3ae603d
Remove stray dbg statements
2023-12-01 11:49:25 +01:00
Antonio Scandurra
1b07fd6a70
Fix edits not being reported when rewrapping
2023-12-01 11:48:21 +01:00
Conrad Irwin
0441b4805a
Show cursor position in status bar ( #3464 )
...
Passes the compiler so it must work!
(though it doesn't show up until we fix pane focus)
Release Notes:
- N/A
2023-11-30 16:40:42 -07:00
Max Brunsfeld
c63ca09eed
Reintroduce pane navigation history in zed2
2023-11-30 12:10:25 -08:00
Conrad Irwin
75afb65b26
Show cursor position in status bar
2023-11-30 10:16:24 -07:00
Antonio Scandurra
0e1597d385
WIP
2023-11-30 18:00:41 +01:00
Julia
428c517693
Merge branch 'main' into zed2-breadcrumbs
2023-11-30 11:38:29 -05:00
Antonio Scandurra
d2c1897385
Fix error in tests
2023-11-30 11:45:10 +01:00
Max Brunsfeld
c95a7c7387
Address some TODOs in editor2 crate ( #3445 )
...
* Fix crash when jumping to definition
* Enabling resolution of completions
* Make links in interactive text clickable
* Enable code paths that use `select_anchors`
2023-11-29 16:32:02 -08:00
Marshall Bowers
b357ae4dc3
Add new Button and IconButton components ( #3448 )
...
This PR adds new `Button` and `IconButton` components built on top of
our new button abstractions.
Both of these buttons are built from the common `ButtonLike` base, and
implement the `ButtonCommon` (name TBD) trait in order to provide a
common interface.
There are still some visual tweaks that we'll need to make to the new
buttons, but those should be straightforward to make after we land this.
Release Notes:
- N/A
2023-11-29 17:41:44 -05:00
Max Brunsfeld
0b8f9067ff
Implement highlighting of go-to-definition links
2023-11-29 14:30:31 -08:00
Max Brunsfeld
9451bd605d
Implement completion-resolution in editor2
...
Enable the completion tests in editor2.
2023-11-29 14:20:47 -08:00
Max Brunsfeld
2bd428102b
Use pointer cursor style for clickable ranges in InteractiveText
2023-11-29 12:42:09 -08:00
Max Brunsfeld
fc2251e7ed
Implement SelectionsCollection::select_anchor_ranges
2023-11-29 12:41:22 -08:00
Nate Butler
3c05d57e6a
Style hover popover
2023-11-29 14:56:23 -05:00
Conrad Irwin
75891e83f3
Fix mouse events when element is occluded ( #3417 )
...
This commit adds a depth map to the frame so we can find the "top most"
opaque layer by stacking order for a given point.
This lets us determine whether the element being hovered was part of the
given layer in the previous frame, which fixes the hover issue.
Still to do:
* [ ] Fix up mouse events too (I tried this, but it's not working yet,
and I want to understand why)
Release Notes:
- N/A
2023-11-28 15:57:22 -07:00
Conrad Irwin
a761e6ca0e
More mouse occlusion work
2023-11-28 09:59:58 -07:00
Nate Butler
ca2052b0c1
Merge branch 'main' into completions-styles
2023-11-27 19:22:07 -05:00
Conrad Irwin
107c3d7f67
Fix esc in command palette
...
Also: add editor.register_action
2023-11-27 14:32:22 -07:00
Julia
d551b41aae
zed2: Mostly port breadcrumbs & improve StyledText api
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-11-27 16:09:31 -05:00
Conrad Irwin
82f6f77117
Use editor's overlay implementation
2023-11-27 11:49:51 -07:00
Conrad Irwin
212d9254e1
Merge branch 'main' into completions-styles
2023-11-27 11:49:39 -07:00
Conrad Irwin
7a8aba329b
Break content mask for hoverables
2023-11-27 11:43:14 -07:00
Antonio Scandurra
3ea12ad0d7
Remove commented out code
2023-11-27 19:19:56 +01:00
Antonio Scandurra
fc4b621b32
Use element_hover instead of red
2023-11-27 19:16:06 +01:00
Antonio Scandurra
8c53f1b9c2
Uncomment hover popover tests
2023-11-27 19:14:58 +01:00
Antonio Scandurra
1e6214440d
Show diagnostic hover popover
2023-11-27 19:08:25 +01:00
Antonio Scandurra
a5951df21f
Start on hover popover
2023-11-27 18:56:37 +01:00
Nate Butler
8a35a02863
Checkpoint - try using overlay for completions popover
...
[no ci]
2023-11-27 11:22:19 -05:00
Nate Butler
1acc6b462f
Start on completions styles
2023-11-27 10:29:29 -05:00
Antonio Scandurra
3ba5dbb9e8
Prevent mousedown on docs from being propagated to the editor
2023-11-27 15:15:57 +01:00
Antonio Scandurra
eb647be685
Pass max height manually
2023-11-27 14:56:46 +01:00
Antonio Scandurra
0baa9a782b
Start on wiring up render_parsed_markdown
2023-11-24 17:28:59 +01:00
Antonio Scandurra
d31b53b912
Extract a gpui::combine_highlights function
2023-11-24 16:31:38 +01:00
Antonio Scandurra
e5b6b0ee9e
WIP
2023-11-24 15:05:04 +01:00
Antonio Scandurra
19bfed165b
Show single-line docs in autocomplete and apply completion on mousedown
2023-11-24 13:22:25 +01:00
Antonio Scandurra
54357d6553
Syntax highlight completions
2023-11-24 13:10:56 +01:00
Antonio Scandurra
bf39968105
Return TextRuns in combine_syntax_and_fuzzy_match_highlights
2023-11-24 13:00:20 +01:00
Antonio Scandurra
510320bb47
Introduce InteractiveText ( #3397 )
...
This new element will let us react to click events on arbitrary ranges
of some rendered text, e.g.:
```rs
InteractiveText::new(
"element-id",
StyledText::new("Hello world, how is it going?").with_runs(vec![
cx.text_style().to_run(6),
TextRun {
background_color: Some(green()),
..cx.text_style().to_run(5)
},
cx.text_style().to_run(18),
]),
)
.on_click(vec![2..4, 1..3, 7..9], |range_ix, cx| {
println!("Clicked range {range_ix}");
})
```
As part of this, I also added the ability to give text runs a background
color.
Release Notes:
- N/A
2023-11-23 19:35:03 +01:00
