zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix confusing error message

Browse Source
This commit is contained in:
Conrad Irwin 2023-11-07 12:00:05 -07:00
parent 3a72f2122a
commit b804b25c21
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/gpui2/src/element.rs
View File

@ -134,7 +134,10 @@ where
.layout(state, frame_state.as_mut().unwrap(), cx); .layout(state, frame_state.as_mut().unwrap(), cx);
} }
} }
_ => panic!("must call initialize before layout"), ElementRenderPhase::Start => panic!("must call initialize before layout"),
ElementRenderPhase::LayoutRequested { .. } | ElementRenderPhase::Painted => {
panic!("element rendered twice")
}
}; };
self.phase = ElementRenderPhase::LayoutRequested { self.phase = ElementRenderPhase::LayoutRequested {

7
crates/gpui2/src/interactive.rs
View File

@ -397,9 +397,10 @@ pub trait ElementInteraction<V: 'static>: 'static {
None None
}), }),
)); ));
let result = stateful.stateless.initialize(cx, f);
stateful.key_listeners.pop(); cx.with_key_dispatch_context(stateful.dispatch_context.clone(), |cx| {
result cx.with_key_listeners(mem::take(&mut stateful.key_listeners), f)
})
}) })
} else { } else {
let stateless = self.as_stateless_mut(); let stateless = self.as_stateless_mut();