Commit Graph
31 Commits
Author SHA1 Message Date
Mikayla 9a3cd073c7 Restore a bunch of random workspace stuff 2023-11-16 23:05:28 -08:00
Mikayla 78cea69172 Add focusable view and restore workspace deserialization. Partially restore split and tab functions 2023-11-15 16:36:43 -08:00
Mikayla a97c8bf58f Get workspace compiling with new event emitters 2023-11-08 19:29:00 -08:00
Marshall Bowers 74853ea55f Rename ThemeVariant to Theme (#3252)
This PR renames the `ThemeVariant` type to `Theme`.

This better reflects its purpose, as well as matches the same name as we
had before, which should make porting crates slightly easier.

Release Notes:

- N/A
2023-11-07 10:41:36 -05:00
Antonio Scandurra 097171b9b8 Merge remote-tracking branch 'origin/main' into editor2 2023-11-03 14:47:49 +01:00
Antonio Scandurra 77e3c7f8ee WIP 2023-11-03 12:10:15 +01:00
Kirill Bulatov eb8a0e7148 Uncomment persistence tests 2023-11-03 12:38:09 +02:00
Antonio Scandurra 6fc7b17259 Expose a focus handle from workspace::Item 2023-11-03 11:00:57 +01:00
Antonio Scandurra efa27cf9b8 Uncomment more editor code 2023-11-03 10:09:00 +01:00
Nathan Sobo f3b8a9d8c2 WIP 2023-11-02 22:56:04 -06:00
Nathan Sobo dfc7c81500 WIP 2023-11-02 21:03:29 -06:00
Antonio Scandurra d4e199cab1 WIP 2023-11-02 13:58:42 +01:00
Antonio Scandurra 32dded551c Checkpoint 2023-11-02 11:05:24 +01:00
Mikayla 6f38eb3252 Finish main merge 2023-11-01 11:52:14 -07:00
Mikayla 1c1b53ecf6 WIP 2023-11-01 11:45:31 -07:00
Kirill Bulatov a9d7c86307 WIP 2023-11-01 15:37:51 +02:00
Kirill Bulatov 73c97d0c10 WIP
Uncomment more methods in workspace2.rs
2023-11-01 14:47:29 +02:00
KCaverly 551171a339 Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace 2023-10-31 11:39:34 -04:00
KCaverly 68a1c7ce4c wip 2023-10-31 11:32:56 -04:00
KCaverlyandKirill 5550e80c4e workspace2 is compiling
Co-Authored-By: Kirill <kirill@zed.dev>
2023-10-31 11:14:43 -04:00
KCaverly 663e8aed8a wip progress 2023-10-31 10:49:51 -04:00
Antonio Scandurra 14a6199b4b WIP: Make the item module compile again 2023-10-31 13:56:48 +01:00
Antonio Scandurra 538a9e1392 WIP 2023-10-31 11:56:55 +01:00
Mikayla 3dadfb8ba8 Merge branch 'zed2' into zed2-workspace 2023-10-30 16:53:21 -07:00
Antonio Scandurra 1a54ac0d69 Rename Handle to Model 2023-10-30 19:44:01 +01:00
Antonio Scandurra 9688937468 WIP 2023-10-30 19:33:23 +01:00
Antonio Scandurra b9ce186d21 WIP 2023-10-30 16:54:55 +01:00
Antonio Scandurra 89bcbe3eeb WIP 2023-10-30 16:43:01 +01:00
Antonio Scandurra d4d9fcc88c WIP 2023-10-30 15:39:58 +01:00
d9274416b4 Make activate_workspace_for_project compile
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
Co-Authored-By: Kirill Bulatov <kirill@zed.dev>
2023-10-26 14:36:55 +02:00
Antonio Scandurra c8b5b085f4 WIP 2023-10-26 12:27:20 +02:00