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 and Julia
b6914bf0fd
Re-enable find all references
...
Co-Authored-By: Julia <julia@zed.dev >
2023-11-14 16:09:29 +01:00
Antonio Scandurra and Julia
f9b9b7549f
Render block elements
...
Co-Authored-By: Julia <julia@zed.dev >
2023-11-14 16:03:06 +01:00
Nathan Sobo
364e3e7de5
Merge remote-tracking branch 'origin/main' into element-types
2023-11-14 01:55:58 -07:00
Nathan Sobo
27fb381cca
Checkpoint
2023-11-14 01:15:48 -07:00
Conrad Irwin
e0416e9d2a
Fix SingleLine editor font size
2023-11-13 21:41:41 -07:00
Conrad Irwin
06f3c60be8
Fix action dispatching...
2023-11-13 18:56:59 -07:00
Mikayla
7d1593b90c
Merge branch 'main' into editor-tests
2023-11-13 15:53:22 -08:00
Mikayla and conrad
a4e9fea133
WIP
...
co-authored-by: conrad <conrad.irwin@zed.dev >
2023-11-13 15:53:04 -08:00
Conrad Irwin
f464d69ff8
Merge branch 'main' into dispatch-tree
2023-11-13 13:21:57 -07:00
Mikayla
0e3fd92bd0
Get editor tests compiling
2023-11-13 12:10:14 -08:00
Nate Butler
800ad1d3dc
Update command palette style
2023-11-12 22:13:54 -05:00
Nathan Sobo
7eaba8fabc
WIP
2023-11-10 14:47:45 -07:00
Nate Butler and Marshall Bowers
6bdb6e486e
Refactor command palette, picker and code action styles.
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-10 16:13:25 -05:00
Nathan Sobo and Antonio Scandurra
74a0d9316a
Add a DispatchTree which will replace the existing key dispatch strategy
...
Instead of freezing a stack, we will record the entire dispatch tree so we can
change focus.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-11-10 11:56:14 -07:00
Antonio Scandurra
c2c6921734
🔥
2023-11-10 16:41:21 +01:00
Antonio Scandurra
198a854370
Fix bad import
2023-11-10 16:41:21 +01:00
Antonio Scandurra
468a014bfc
Allow measuring arbitrary items in UniformList
2023-11-10 16:41:21 +01:00
Antonio Scandurra
c44db3b7ec
Confirm code action on mouse down
2023-11-10 16:41:21 +01:00
Antonio Scandurra
fb450e35f7
Wire up keyboard interaction in code actions menu
2023-11-10 16:41:21 +01:00
Antonio Scandurra
bf576d47b1
Make code actions menu prettier
2023-11-10 16:41:21 +01:00
Antonio Scandurra
a30b47aa5f
Show a very basic code actions menu
2023-11-10 12:26:35 +01:00
Antonio Scandurra
1a0ddc424b
WIP
2023-11-09 19:11:17 +01:00
b029083441
Start on rendering context menu in editor2
...
Co-Authored-By: Nathan <nathan@zed.dev >
Co-Authored-By: Mikayla <mikayla@zed.dev >
2023-11-09 19:03:10 +01:00
Antonio Scandurra and Nathan
5d15886675
Render code actions indicator
...
Co-Authored-By: Nathan <nathan@zed.dev >
2023-11-09 18:43:26 +01:00
Nathan Sobo
8c44f6a814
Simplify input handling ( #3282 )
...
This PR takes a different approach to input handling.
Rather than returning the optional input handler, focus handle pair from
the element trait, we instead allow you to register an input handler
imperatively on the window context with `WindowContext::handle_input`.
You pass a focus handle reference and any implementer of
`PlatformInputHandler`. There's an `ElementInputHandler<V>` that
implements `PlatformWindowHandler` so long as `V` implements
`InputHandler`.
Release Notes:
- N/A
2023-11-08 22:27:36 -07:00
Mikayla
2c67cc80ba
Merge branch 'main' into event-emitter
2023-11-08 20:10:38 -08:00
Nathan Sobo
9a022671a2
Simplify IME support
2023-11-08 21:06:00 -07:00
Mikayla
3c57b912b9
Update editor to use new event emitter
2023-11-08 19:52:43 -08:00
Mikayla
a97c8bf58f
Get workspace compiling with new event emitters
2023-11-08 19:29:00 -08:00
Max Brunsfeld
4350801399
Merge branch 'main' into bounds-for-range
2023-11-08 17:31:00 -08:00
Mikayla
Conrad Irwin
Antonio ScandurraandNathan Sobo
Max Brunsfeld
Nate Butler
