Antonio Scandurra
2b6e8de11f
Don't perform wrapping in completions
2023-11-22 14:23:09 +01:00
Antonio Scandurra
f2c63781f9
Merge branch 'main' into editor2-autocomplete
...
# Conflicts:
# crates/editor2/src/editor.rs
2023-11-21 17:43:09 +01:00
Nate Butler
453aa5ffd7
TextColor -> Color
2023-11-21 01:05:29 -05:00
Piotr Osiewicz
54a3b56935
Merge remote-tracking branch 'origin/callback-handles' into search2
2023-11-21 00:40:20 +01:00
2c4d83c9af
WIP
...
co-authored-by: conrad <conrad@zed.dev >
co-authored-by: Nathan <nathan@zed.dev >
2023-11-20 14:46:01 -08:00
Piotr Osiewicz
d60855b06d
Merge branch 'main' into search2
2023-11-20 19:23:35 +01:00
Piotr Osiewicz
07cc5904f8
Merge branch 'main' into search2
2023-11-20 18:37:41 +01:00
Piotr Osiewicz
3d28495c67
fixup! Remove dbg statements
2023-11-20 18:35:39 +01:00
Piotr Osiewicz
c1f0ac30a0
Fix up tests once and for good
2023-11-20 18:24:37 +01:00
Conrad Irwin
f86480ba5d
Merge followup mess
2023-11-20 09:58:05 -07:00
Conrad Irwin
0798cfd58c
Merge branch 'main' into derive-element-redux
2023-11-20 09:15:38 -07:00
Joseph T. Lyons
8e612e4287
Restore commented-out code
2023-11-19 22:00:01 -05:00
Joseph T. Lyons
3abd376d6a
Add timestamp delta to telemetry events
2023-11-19 21:52:28 -05:00
Nathan Sobo
33cd6f520a
Clean compile with redesigned element traits
2023-11-18 21:51:47 -07:00
Nathan Sobo
0673606de8
WIP
2023-11-18 20:22:43 -07:00
Nathan Sobo
adc355a1e6
Element refinement passing on ui2
2023-11-18 20:05:47 -07:00
Nate Butler
d6f173866e
Use muted color for fold indicators
2023-11-18 01:02:40 -05:00
Julia
3655a96e54
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:32:35 -05:00
Julia
c6d22af416
Get diagnostic2 tests building and running
2023-11-17 16:32:35 -05:00
Julia
a464a7da2a
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:32:35 -05:00
Julia and Nathan Sobo
f4eb219c75
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
Antonio Scandurra
27cd7b204d
Merge branch 'main' into editor2-autocomplete
2023-11-17 11:03:25 +01:00
Nathan Sobo
2fb13cf1ca
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
9558da8681
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
61bd6bab09
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
49d3e1cc4b
Add default derive
2023-11-16 17:39:05 -08:00
Mikayla
4de2c0f7ef
Re-implement actions as derive macros instead of blanket impls
2023-11-16 17:32:02 -08:00
Nate Butler and Marshall Bowers
38d0fdc09a
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
c71e522b4e
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
Antonio Scandurra
c08ce1c3b8
Start rendering autocompletion menu
2023-11-16 14:55:06 +01:00
Mikayla
9da0b78ead
Merge branch 'main' into tabs-n-splits
2023-11-15 23:41:25 -08:00
Conrad Irwin
0a9fb3978b
Enable panel switching
2023-11-15 21:01:00 -07:00
Mikayla
78cea69172
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
c7b7f7dfd5
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
3ff8c78b58
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
851a60a68e
Render fold indicators in the gutter
2023-11-15 14:07:37 +01:00
Antonio Scandurra
45381e566c
Fix focus management on editor when renaming
2023-11-15 11:05:09 +01:00
Antonio Scandurra
feeb44c122
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
c3094b7c3d
Introduce gpui::render_view
2023-11-15 09:45:23 +01:00
Antonio Scandurra
1def355d44
Don't return Result from TextStyle::highlight
2023-11-15 09:10:46 +01:00
Mikayla
b81b96f353
Merge branch 'element-types' of github.com:zed-industries/zed into element-types
2023-11-14 15:55:53 -08:00
Mikayla
7f72df6dcf
Merge branch 'main' into element-types
2023-11-14 15:49:10 -08:00
Mikayla Maki
df64a3c701
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
bef4df5df9
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
6b25841e2a
WIP
2023-11-14 14:48:34 -08:00
Max Brunsfeld
123faed5b0
Re-enable all project panel tests
...
Some are still failing.
2023-11-14 12:45:46 -08:00
Conrad Irwin
5dda105182
Merge branch 'main' into element-types
2023-11-14 11:45:19 -07:00
Antonio Scandurra
48b3a90fbf
WIP
2023-11-14 19:42:07 +01:00
Antonio Scandurra
428be43710
Wire up rename editor
2023-11-14 18:50:02 +01:00
Antonio Scandurra
7f5014b34a
Add red background to blocks that need styling
2023-11-14 17:15:33 +01:00
Antonio Scandurra
Nate Butler
Piotr Osiewicz
Conrad Irwin
Joseph T. Lyons
Julia
Max Brunsfeld