Commit Graph
170 Commits
Author SHA1 Message Date
KCaverlyandKirill 5550e80c4e workspace2 is compiling
Co-Authored-By: Kirill <kirill@zed.dev>
2023-10-31 11:14:43 -04:00
KCaverly e315e1bb6c small window change 2023-10-31 10:50:28 -04:00
KCaverly efce38fce2 wip 2023-10-31 10:04:04 -04:00
Antonio Scandurra 14a6199b4b WIP: Make the item module compile again 2023-10-31 13:56:48 +01:00
Antonio Scandurra e8eea52d0f Allow WeakView<T> to be hashed and compared 2023-10-31 13:34:54 +01:00
Antonio Scandurra 46a99c5c41 Allow View<T> to be hashed and compared 2023-10-31 13:34:29 +01:00
Antonio Scandurra 163fa3ff16 Introduce {Window,View}Context::defer 2023-10-31 13:17:05 +01:00
Antonio Scandurra 538a9e1392 WIP 2023-10-31 11:56:55 +01:00
Antonio Scandurra 00c92ae407 Merge branch 'zed2' into zed2-workspace 2023-10-31 10:20:03 +01:00
Antonio Scandurra 88875fd006 Zed2 entities (#3189)
Adds an `Entity` trait for abstracting over `View`s and `Model`s, and
implements it for the `subscribe()` and `observe()` APIs.

The last commit also includes a fun experiment I added, using the
`Result` type to return the owned model handles back to the caller in
the case of downcast failure, inspired by the `binary_search*` methods.
2023-10-31 10:11:25 +01:00
Julia db34de6be4 Port zed/src/languages to zed2 2023-10-30 21:52:29 -04:00
Mikayla f5b13071f1 experiment with a way to recover the any entities when downcasting fails 2023-10-30 18:08:38 -07:00
Mikayla 6f1197e00c Change model to downcast with ownership 2023-10-30 18:00:37 -07:00
Mikayla 327a2f9967 Add the entity trait and implement for models, views, subscriptions, and observations 2023-10-30 17:50:21 -07:00
Mikayla 3dadfb8ba8 Merge branch 'zed2' into zed2-workspace 2023-10-30 16:53:21 -07:00
30dffbb409 Introduce a Render trait, make views implement it
Don't pass a render function separately from the view.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Antonio <as-cii@zed.dev>
2023-10-30 15:19:40 -07:00
Antonio Scandurra 0128079de0 WIP 2023-10-30 20:36:48 +01:00
bc4f8fbf4e Rename other references from "handle" to "model"
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Mikayla <mikayla@zed.dev>
2023-10-30 19:54:32 +01: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 e2ee9a28bf Implement activate_workspace_for_project 2023-10-30 14:50:50 +01:00
Antonio Scandurra bd750fbbe2 Merge branch 'zed2' into zed2-workspace 2023-10-30 12:16:34 +01:00
Antonio Scandurra 25e882d72a Remove randomness from GPUI2 block_with_timeout 2023-10-30 12:10:55 +01:00
Nathan Sobo e27427dce8 Merge branch 'gpui2-docs' into zed2 2023-10-27 17:07:28 -06:00
Nathan Sobo f88ca2e7da Add docs for window.rs, but still incomplete 2023-10-27 22:29:59 +02:00
Nathan Sobo ad7c49e4bb Add doc comments to app.rs 2023-10-27 21:19:48 +02:00
Conrad Irwin 67ecc2fe04 Comment out failing gpui2 test 2023-10-27 11:24:23 +02:00
Conrad Irwin af0c010b4a Remove deadlock from gpui2 pasteboard 2023-10-27 11:14:13 +02:00
Conrad Irwin 5f5234c5da Fix fs2 tests 2023-10-27 10:51:36 +02:00
Conrad Irwin c1904b493b Fix cargo fmt 2023-10-27 10:44:57 +02:00
Nathan Sobo a1c3826858 Add View::update which provides a ViewContext 2023-10-26 19:41:42 +02:00
Antonio Scandurra 8e3314e680 WIP 2023-10-26 18:17:45 +02:00
Antonio Scandurra 637cff3ebd WIP 2023-10-26 17:15:19 +02:00
Max Brunsfeld 65045b9c52 Get remaining language2 tests passing 2023-10-26 16:38:50 +02:00
Max BrunsfeldandMarshall Bowers 0eae962abf Represent theme's syntax colors with string keys
Co-authored-by: Marshall Bowers <marshall@zed.dev>
2023-10-26 16:38:50 +02:00
Max BrunsfeldandConrad 8bc2071414 Fix gpui2 bugs
* Compile error for tests that take StdRng
* Dynamic type dowcasting error when emitting events
* Slot error when dropping handles

Co-authored-by: Conrad <conrad@zed.dev>
2023-10-26 15:54:19 +02:00
Antonio Scandurra 821fe0f5b5 Merge branch 'zed2' into zed2-workspace 2023-10-26 15:34:55 +02:00
Marshall Bowers d62c51a4b8 Merge branch 'gpui2-element-renderer' into zed2 2023-10-26 15:23:02 +02:00
Marshall Bowers fccc4ca85c Initialize element before layout 2023-10-26 15:22:48 +02:00
Antonio Scandurra 9ea79259d5 Add spawn facilities to AsyncWindowContext 2023-10-26 15:00:44 +02:00
69e5ecc015 Enable client tests
* implement Executor::advance_clock

Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by:  Kyle <kyle@zed.dev>
Co-authored-by:  Joseph <joseph@zed.dev>
2023-10-26 14:44:13 +02: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
Kirill Bulatov 27d2accb51 Fix the formatting 2023-10-26 13:52:04 +02:00
Kirill Bulatov 0a04c5734b Update mouse position during file drag and drop 2023-10-26 13:50:35 +02:00
Max Brunsfeld a4b7e3c9f6 Merge branch 'zed2-hangs' into zed2 2023-10-26 12:48:35 +02:00
065d26f5b2 Get RPC2 tests passing
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Kyle <kyle@zed.dev>
2023-10-26 12:47:37 +02:00
Nathan Sobo 0285284ae1 Rename IntoAnyElement trait to Component 2023-10-26 12:46:52 +02:00
Nathan Sobo 8ecfea55cd Replace derive Element with derive IntoAnyElement everywhere 2023-10-26 12:38:23 +02:00
Antonio Scandurra c8b5b085f4 WIP 2023-10-26 12:27:20 +02:00