mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-06 18:46:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Checkpoint

Browse source
This commit is contained in:
Nathan Sobo 2023-09-12 21:07:35 -06:00
parent 53b698adb6
commit cae5c76bed
1 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
crates/storybook/src/sketch.rs
View file

@ -115,7 +115,7 @@ impl<'a, 'w> WindowContext<'a, 'w> {
impl<'app, 'win> WindowContext<'app, 'win> { impl<'app, 'win> WindowContext<'app, 'win> {
fn add_entity<T: 'static>( fn add_entity<T: 'static>(
&mut self, &mut self,
build_entity: impl FnOnce(&mut ViewContext<'app, 'win, '_, T>) -> T, build_entity: impl FnOnce(&mut ViewContext<'_, 'app, 'win, T>) -> T,
) -> Handle<T> { ) -> Handle<T> {
let id = EntityId::new(&mut self.app_context().entity_count); let id = EntityId::new(&mut self.app_context().entity_count);
let mut cx = ViewContext::mutable(self, id); let mut cx = ViewContext::mutable(self, id);
@ -155,16 +155,16 @@ impl<'app, 'win> WindowContext<'app, 'win> {
} }
#[derive(Deref, DerefMut)] #[derive(Deref, DerefMut)]
pub struct ViewContext<'a, 'b, 'c, T> { pub struct ViewContext<'parent, 'app, 'win, T> {
#[deref] #[deref]
#[deref_mut] #[deref_mut]
window_cx: Reference<'c, WindowContext<'a, 'b>>, window_cx: Reference<'parent, WindowContext<'app, 'win>>,
entity_type: PhantomData<T>, entity_type: PhantomData<T>,
entity_id: EntityId, entity_id: EntityId,
} }
impl<'a, 'b, 'c, V> ViewContext<'a, 'b, 'c, V> { impl<'cx, 'app: 'cx, 'win: 'cx, V> ViewContext<'cx, 'app, 'win, V> {
fn mutable(window_cx: &'c mut WindowContext<'a, 'b>, entity_id: EntityId) -> Self { fn mutable(window_cx: &'cx mut WindowContext<'app, 'win>, entity_id: EntityId) -> Self {
Self { Self {
window_cx: Reference::Mutable(window_cx), window_cx: Reference::Mutable(window_cx),
entity_id, entity_id,
@ -172,7 +172,7 @@ impl<'a, 'b, 'c, V> ViewContext<'a, 'b, 'c, V> {
} }
} }
fn immutable(window_cx: &'c WindowContext<'a, 'b>, entity_id: EntityId) -> Self { fn immutable(window_cx: &'cx WindowContext<'app, 'win>, entity_id: EntityId) -> Self {
Self { Self {
window_cx: Reference::Immutable(window_cx), window_cx: Reference::Immutable(window_cx),
entity_id, entity_id,
@ -213,18 +213,47 @@ pub struct Handle<T> {
entity_type: PhantomData<T>, entity_type: PhantomData<T>,
} }
trait Context { trait Context<'a, 'parent, 'app, 'win> {
type EntityContext<T>; type EntityContext<T: 'static>;
fn update_entity<T, R>( fn update_entity<T: 'static, R>(
&mut self, &mut self,
handle: &Handle<T>, handle: &Handle<T>,
update: impl FnOnce(&mut T, Self::EntityContext<T>) -> R, update: impl FnOnce(&mut T, Self::EntityContext<T>) -> R,
) -> R; ) -> R;
} }
impl<T> Handle<T> { impl<'a, 'parent: 'a, 'app, 'win> Context<'a, 'parent, 'app, 'win> for AppContext {
fn update<C: Context, R>( type EntityContext<T: 'static> = &'a mut ModelContext<'parent, T>;
fn update_entity<T: 'static, R>(
&mut self,
handle: &Handle<T>,
update: impl FnOnce(&mut T, Self::EntityContext<T>) -> R,
) -> R {
todo!()
}
}
impl<'a, 'parent, 'app, 'win> Context<'a, 'parent, 'app, 'win> for WindowContext<'app, 'win>
where
'parent: 'a,
'app: 'parent,
'win: 'parent,
{
type EntityContext<T: 'static> = &'a mut ViewContext<'parent, 'app, 'win, T>;
fn update_entity<T: 'static, R>(
&mut self,
handle: &Handle<T>,
update: impl FnOnce(&mut T, Self::EntityContext<T>) -> R,
) -> R {
todo!()
}
}
impl<T: 'static> Handle<T> {
fn update<'a, 'parent, 'app, 'win, C: Context<'a, 'parent, 'app, 'win>, R>(
&self, &self,
cx: &mut C, cx: &mut C,
update: impl FnOnce(&mut T, C::EntityContext<T>) -> R, update: impl FnOnce(&mut T, C::EntityContext<T>) -> R,
@ -358,7 +387,8 @@ pub fn view<ParentState, ChildState: 'static>(
render: impl 'static + Fn(&mut ChildState, &mut ViewContext<ChildState>) -> AnyElement<ParentState>, render: impl 'static + Fn(&mut ChildState, &mut ViewContext<ChildState>) -> AnyElement<ParentState>,
) -> View<ParentState> { ) -> View<ParentState> {
View { View {
render: todo!(), // Rc::new(move |cx| state.update(cx, |state, cx| render(state, cx))), // render: Rc::new(move |cx| state.update(cx, |state, cx| render(state, cx))),
render: todo!(),
} }
} }