Antonio Scandurra
7eeb8078f6
Allow setting text background color via TextStyle
2023-11-23 19:22:18 +01:00
Kirill Bulatov
df7b89b6cb
Allow to include gitignored files into project search ( #3394 )
2023-11-23 19:28:11 +02:00
Antonio Scandurra
3b918bfee8
Merge branch 'main' into rename-element-traits
...
# Conflicts:
# crates/gpui2/src/elements/uniform_list.rs
# crates/ui2/src/components/context_menu.rs
# crates/ui2/src/components/list.rs
2023-11-23 12:47:46 +01:00
Kirill Bulatov
eee63835fb
Exclude more ignored/worktree-less/project-less buffers from inlay hint requests
2023-11-23 10:30:52 +02:00
Julia
37e3cc1291
zed2(ish) Cancel completion resolution when new list
2023-11-22 16:26:27 -05:00
Nathan Sobo
c23f17ee0b
Reorganize element-related traits
2023-11-22 11:19:43 -07:00
Antonio Scandurra
524f892fb0
Correctly swap position of context menu
2023-11-22 19:02:44 +01:00
Antonio Scandurra
8aaa46a1b6
Track scroll in editor's context menu
2023-11-22 17:58:00 +01:00
Antonio Scandurra
2b6e8de11f
Don't perform wrapping in completions
2023-11-22 14:23:09 +01:00
Antonio Scandurra
3a8e9b5697
Avoid holding borrow to editor while painting child elements
2023-11-22 11:40:38 +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
Nathan Sobo
2515bbf990
Move self in Element::paint
...
Remove mutable state borrows in favor of state ownership in render processes to streamline element rendering.
2023-11-17 23:32:55 -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
Piotr Osiewicz
dca2dc7b6b
Merge branch 'main' into search2
2023-11-17 13:22:30 +01:00
Antonio Scandurra
27cd7b204d
Merge branch 'main' into editor2-autocomplete
2023-11-17 11:03:25 +01:00
Mikayla
1693718637
Merge branch 'main' into saving-2
2023-11-16 23:11:38 -08:00
Mikayla
9a3cd073c7
Restore a bunch of random workspace stuff
2023-11-16 23:05:28 -08: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
a526f23c81
Add ui_font settings and set default rem size accordingly ( #3346 )
...
[[PR Description]]
- Adds ui_font_family, ui_font_features, ui_font_size to settings and
default settings
- Use the new ui font settings to set the rem size when the workspace is
created.
Release Notes:
- N/A
2023-11-16 15:40:33 -05:00
Marshall Bowers
b559bfd80f
Parameterize theme2::init to allow loading just the base theme ( #3345 )
...
This PR adds a parameter to the `theme2::init` method to indicate what
the theme-loading behavior should be.
This allows us to indicate when we want to load all of the additional
built-in user themes (like in the Zed binary and in the storybook), and
when we don't want to load the user themes (like in tests).
We're using an enum over just a `bool` here for clarity at the call
site.
Release Notes:
- N/A
2023-11-16 13:03:30 -05: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
Piotr Osiewicz
6b6a30c3da
Merge branch 'main' into search2
2023-11-16 17:16:15 +01:00
Antonio Scandurra
c08ce1c3b8
Start rendering autocompletion menu
2023-11-16 14:55:06 +01:00
Kirill Bulatov
fd61683c46
WIP
2023-11-16 10:40:02 +02:00
Mikayla
9da0b78ead
Merge branch 'main' into tabs-n-splits
2023-11-15 23:41:25 -08:00
Conrad Irwin
8c14a8fa95
Merge branch 'main' into collab_ui2
2023-11-15 21:04:47 -07:00
Conrad Irwin
0a9fb3978b
Enable panel switching
2023-11-15 21:01:00 -07:00
Antonio Scandurra
Kirill Bulatov
Kirill Bulatov
Julia
Nathan Sobo
Nate Butler
Piotr Osiewicz
Conrad Irwin
Joseph T. Lyons
Marshall Bowers
