Conrad Irwin
7147bff519
Merge followup mess
2023-11-20 09:58:05 -07:00
Conrad Irwin
16cca67638
Merge branch 'main' into derive-element-redux
2023-11-20 09:15:38 -07:00
Joseph T. Lyons
2c70da8784
Restore commented-out code
2023-11-19 22:00:01 -05:00
Joseph T. Lyons
e000d61ca8
Add timestamp delta to telemetry events
2023-11-19 21:52:28 -05:00
Nathan Sobo
42badd5d25
Clean compile with redesigned element traits
2023-11-18 21:51:47 -07:00
Nathan Sobo
346aa2f30f
WIP
2023-11-18 20:22:43 -07:00
Nathan Sobo
d2d1f1a1ff
Element refinement passing on ui2
2023-11-18 20:05:47 -07:00
Nate Butler
61027a4183
Use muted color for fold indicators
2023-11-18 01:02:40 -05:00
Julia
9a986fc6ab
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:32:35 -05:00
Julia
5ded1aa46f
Get diagnostic2 tests building and running
2023-11-17 16:32:35 -05:00
Julia
393a0dd154
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:32:35 -05:00
Julia and Nathan Sobo
77947a8b50
Get diagnostics view almost building in the zed2 world
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-11-17 16:32:35 -05:00
Nathan Sobo
d9fc569a64
Separate WrappedLines from ShapedLines ( #3350 )
...
ShapedLines are never wrapped, whereas WrappedLines are optionally
wrapped if they are associated with a wrap width. Originally, when
rewriting GPUI, I tried to combine everything because wrapping is
inherently optional for the Text element, but we have a bunch of APIs
that don't make sense on a line that may wrap, so we need a distinct
type for that case.
This is a precursor to implementing clickable links in markdown. I
noticed multiple places where we were confused about whether or not the
line was wrapped so this felt important.
Release Notes:
- N/A
2023-11-16 23:20:35 -07:00
Nathan Sobo
3ebf361f18
Separate WrappedLines from ShapedLines
...
ShapedLines are never wrapped, whereas WrappedLines are optionally wrapped if
they are associated with a wrap width. I tried to combine everything because
wrapping is inherently optional for the Text element, but we have a bunch of
APIs that don't make sense on a line that may wrap, so we need a distinct type
for that case.
2023-11-16 23:10:51 -07:00
Mikayla Maki
57062bcbc5
Actions‽ ( #3349 )
...
This PR re-implements our actions with macros instead of a blanket impl.
Release Notes:
- N/A
2023-11-16 18:18:04 -08:00
Mikayla
f103ff66a1
Add default derive
2023-11-16 17:39:05 -08:00
Mikayla
a3c156c5a5
Re-implement actions as derive macros instead of blanket impls
2023-11-16 17:32:02 -08:00
Nate Butler and Marshall Bowers
3894669cf2
Remove todo
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-16 11:42:23 -05:00
Nate Butler and Marshall Bowers
4f9f0ce53c
Allow users to set UI font properties in their settings
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-16 11:37:46 -05:00
Mikayla
37e6d07ba7
Merge branch 'main' into tabs-n-splits
2023-11-15 23:41:25 -08:00
Conrad Irwin
48e22edda3
Enable panel switching
2023-11-15 21:01:00 -07:00
Mikayla
e63864a9d5
Add focusable view and restore workspace deserialization. Partially restore split and tab functions
2023-11-15 16:36:43 -08:00
Antonio Scandurra and Nathan Sobo
356b0f81d9
Move render_view into View::render_with
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-11-15 18:50:09 +01:00
Antonio Scandurra and Nathan Sobo
ab975210e3
Return a Fold struct when querying the FoldMap
...
This contains a new `id` field that lets us distinguish among folds.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-11-15 17:09:59 +01:00
Antonio Scandurra
e5e36803b6
Render fold indicators in the gutter
2023-11-15 14:07:37 +01:00
Antonio Scandurra
7d1999d39f
Fix focus management on editor when renaming
2023-11-15 11:05:09 +01:00
Antonio Scandurra
4cec3b821e
Merge remote-tracking branch 'origin/main' into editor2-rename
...
# Conflicts:
# crates/editor2/src/editor.rs
# crates/editor2/src/element.rs
# crates/gpui2/src/style.rs
2023-11-15 09:51:33 +01:00
Antonio Scandurra
23b886b429
Introduce gpui::render_view
2023-11-15 09:45:23 +01:00
Antonio Scandurra
b086285a00
Don't return Result from TextStyle::highlight
2023-11-15 09:10:46 +01:00
Mikayla
2636da3680
Merge branch 'element-types' of github.com:zed-industries/zed into element-types
2023-11-14 15:55:53 -08:00
Mikayla
7d62f43366
Merge branch 'main' into element-types
2023-11-14 15:49:10 -08:00
Mikayla Maki
6f46f73f98
Not working yet file-finder2 ( #3321 )
...
Porting file_finder
Release Notes:
- N/A
2023-11-14 15:22:59 -08:00
Nathan Sobo and Julia
a413920b00
Return an id from Element::element_id instead of calling cx.with_element_id
...
Co-Authored-By: Julia <julia@zed.dev >
2023-11-14 16:05:28 -07:00
Mikayla
2f92e4ff1b
WIP
2023-11-14 14:48:34 -08:00
Max Brunsfeld
991eff1b36
Re-enable all project panel tests
...
Some are still failing.
2023-11-14 12:45:46 -08:00
Conrad Irwin
56c202d66a
Merge branch 'main' into element-types
2023-11-14 11:45:19 -07:00
Antonio Scandurra
2ece718d63
WIP
2023-11-14 19:42:07 +01:00
Antonio Scandurra
432282bcf9
Wire up rename editor
2023-11-14 18:50:02 +01:00
Antonio Scandurra
ca5ef02d08
Add red background to blocks that need styling
2023-11-14 17:15:33 +01:00
Antonio Scandurra and Julia
1d15d76e5e
Re-enable find all references
...
Co-Authored-By: Julia <julia@zed.dev >
2023-11-14 16:09:29 +01:00
Antonio Scandurra and Julia
d4b9bd4ec8
Render block elements
...
Co-Authored-By: Julia <julia@zed.dev >
2023-11-14 16:03:06 +01:00
Nathan Sobo
7d1a6a81df
Merge remote-tracking branch 'origin/main' into element-types
2023-11-14 01:55:58 -07:00
Nathan Sobo
14d5584205
Checkpoint
2023-11-14 01:15:48 -07:00
Conrad Irwin
223abf15d4
Fix SingleLine editor font size
2023-11-13 21:41:41 -07:00
Conrad Irwin
bc20c70907
Fix action dispatching...
2023-11-13 18:56:59 -07:00
Mikayla
b83845913e
Merge branch 'main' into editor-tests
2023-11-13 15:53:22 -08:00
Mikayla and conrad
a0ef21d91d
WIP
...
co-authored-by: conrad <conrad.irwin@zed.dev >
2023-11-13 15:53:04 -08:00
Conrad Irwin
235edc51c8
Merge branch 'main' into dispatch-tree
2023-11-13 13:21:57 -07:00
Mikayla
c0b2ecf405
Get editor tests compiling
2023-11-13 12:10:14 -08:00
Nate Butler
13a8138462
Update command palette style
2023-11-12 22:13:54 -05:00
Conrad Irwin