Mikayla
37e6d07ba7
Merge branch 'main' into tabs-n-splits
2023-11-15 23:41:25 -08:00
Conrad Irwin
8bb4fb7853
Merge branch 'main' into collab_ui2
2023-11-15 21:04:47 -07:00
Conrad Irwin
48e22edda3
Enable panel switching
2023-11-15 21:01:00 -07:00
Nathan Sobo
48c8cb74e4
Remove initialize from the Element trait ( #3338 )
...
Initially, we imagined registering keyboard handlers in the initialize
phase so we would understand the relationships between focus handles
during the layout pass, which would allow us to assign assign `focus_in`
styles that impact layout.
However, we soon realized that many elements aren't created until paint
time anyway, such as within the uniform list. Since it's impossible to
know prior to paint whether an element contains the focused element, it
makes more sense to eliminate the `focus_in` styling helper.
Release Notes:
- N/A
2023-11-15 19:36:35 -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
Nathan Sobo
05d9dbd083
Remove initialize method from Element trait
2023-11-15 14:11:19 -07:00
Conrad Irwin
5a78d0f94f
Leaky, but better, test abstraction
2023-11-15 14:01:10 -07:00
Antonio Scandurra
f8a570e596
Fix panic when painting blocks
2023-11-15 20:02:35 +01: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
da3c097afe
Fix clicking on code action and fold indicators
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-11-15 18:29:53 +01:00
Antonio Scandurra and Nathan Sobo
7499613cd9
Handle clicking folded ranges
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-11-15 18:19:26 +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
6930a12d24
Extract out a register_actions function
2023-11-15 09:53:32 +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
Conrad Irwin
37b4e9f922
Abandon ship
2023-11-14 16:17:24 -07: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
Max Brunsfeld
3b59f4c242
Enable tests in project panel 2 ( #3325 )
2023-11-14 15:02:51 -08:00
Mikayla
2f92e4ff1b
WIP
2023-11-14 14:48:34 -08:00
Conrad Irwin
07e3bcb6b2
In the middle of stuff
2023-11-14 14:38:23 -07:00
Max Brunsfeld
991eff1b36
Re-enable all project panel tests
...
Some are still failing.
2023-11-14 12:45:46 -08:00
Conrad Irwin
8f1a3dd175
Merge branch 'main' into element-types
2023-11-14 12:10:26 -07:00
Marshall Bowers
beae52db00
Combine LabelColor and IconColor into TextColor
2023-11-14 13:48:01 -05: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
Nathan Sobo
5fcd29f74d
WIP
2023-11-14 11:00:52 -07: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
Antonio Scandurra
0d6d776a8b
WIP
2023-11-14 14:48:59 +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
Nathan Sobo
e39081c034
Checkpoint
2023-11-13 22:42:19 -07:00
Conrad Irwin
223abf15d4
Fix SingleLine editor font size
2023-11-13 21:41:41 -07:00
Nathan Sobo
08263e156a
Checkpoint
2023-11-13 21:40:02 -07:00
Nathan Sobo
2abcae44a1
WIP
2023-11-13 18:58:42 -07:00
Conrad Irwin
bc20c70907
Fix action dispatching...
2023-11-13 18:56:59 -07:00
Nathan Sobo
566a79c9d7
WIP
2023-11-13 18:18:25 -07:00
Mikayla
238a291e61
Fix broken tests and comment out remaining tests
2023-11-13 16:46:06 -08: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
Marshall Bowers
8e2a7b803f
Merge branch 'main' into one-themes
2023-11-13 18:16:45 -05:00
Nate Butler
98916f54d2
WIP
2023-11-13 17:38:44 -05:00
Mikayla