From c3212e559f9b5e942bb565f46748bc7637c06e48 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 2 May 2023 11:15:57 +0200 Subject: [PATCH] Merge pull request #2429 from zed-industries/fix-debug-elements-panic Move `debug_elements` to `AsyncAppContext` --- crates/gpui/src/app.rs | 9 +++++ crates/gpui/src/app/window.rs | 19 +--------- crates/gpui/src/elements.rs | 65 ++++------------------------------- crates/zed/src/zed.rs | 8 ++++- 4 files changed, 23 insertions(+), 78 deletions(-) diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs index c201febed5a22cdc63567db9fb54d0c248949d0c..173b71668982309c83be514c01a43116b3873ad7 100644 --- a/crates/gpui/src/app.rs +++ b/crates/gpui/src/app.rs @@ -43,6 +43,7 @@ use window_input_handler::WindowInputHandler; use crate::{ elements::{AnyElement, AnyRootElement, RootElement}, executor::{self, Task}, + json, keymap_matcher::{self, Binding, KeymapContext, KeymapMatcher, Keystroke, MatchResult}, platform::{ self, FontSystem, KeyDownEvent, KeyUpEvent, ModifiersChangedEvent, MouseButton, @@ -309,6 +310,14 @@ impl AsyncAppContext { self.0.borrow_mut().update_window(window_id, callback) } + pub fn debug_elements(&self, window_id: usize) -> Option { + self.0.borrow().read_window(window_id, |cx| { + let root_view = cx.window.root_view(); + let root_element = cx.window.rendered_views.get(&root_view.id())?; + root_element.debug(cx).log_err() + })? + } + pub fn add_model(&mut self, build_model: F) -> ModelHandle where T: Entity, diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs index f54c18c755c097ccdb5e473fce25e3db007d9157..49befafbec4bfca2fac1782f2d5c8d249b24a951 100644 --- a/crates/gpui/src/app/window.rs +++ b/crates/gpui/src/app/window.rs @@ -1,7 +1,7 @@ use crate::{ elements::AnyRootElement, geometry::rect::RectF, - json::{self, ToJson}, + json::ToJson, keymap_matcher::{Binding, Keystroke, MatchResult}, platform::{ self, Appearance, CursorStyle, Event, KeyDownEvent, KeyUpEvent, ModifiersChangedEvent, @@ -975,17 +975,6 @@ impl<'a> WindowContext<'a> { .flatten() } - pub fn debug_elements(&self) -> Option { - let view = self.window.root_view(); - Some(json!({ - "root_view": view.debug_json(self), - "root_element": self.window.rendered_views.get(&view.id()) - .and_then(|root_element| { - root_element.debug(self).log_err() - }) - })) - } - pub fn set_window_title(&mut self, title: &str) { self.window.platform_window.set_title(title); } @@ -1454,13 +1443,7 @@ impl Element for ChildView { ) -> serde_json::Value { json!({ "type": "ChildView", - "view_id": self.view_id, "bounds": bounds.to_json(), - "view": if let Some(view) = cx.views.get(&(cx.window_id, self.view_id)) { - view.debug_json(cx) - } else { - json!(null) - }, "child": if let Some(element) = cx.window.rendered_views.get(&self.view_id) { element.debug(&cx.window_context).log_err().unwrap_or_else(|| json!(null)) } else { diff --git a/crates/gpui/src/elements.rs b/crates/gpui/src/elements.rs index 09b9c4058994c92cd16d502aae74f6c779ff660e..7de0bc10f59ec0619b596b3a9a52d619a9104943 100644 --- a/crates/gpui/src/elements.rs +++ b/crates/gpui/src/elements.rs @@ -45,7 +45,6 @@ use std::{ mem, ops::{Deref, DerefMut, Range}, }; -use util::ResultExt; pub trait Element: 'static { type LayoutState; @@ -709,7 +708,12 @@ impl AnyRootElement for RootElement { .ok_or_else(|| anyhow!("debug called on a root element for a dropped view"))?; let view = view.read(cx); let view_context = ViewContext::immutable(cx, self.view.id()); - Ok(self.element.debug(view, &view_context)) + Ok(serde_json::json!({ + "view_id": self.view.id(), + "view_name": V::ui_name(), + "view": view.debug_json(cx), + "element": self.element.debug(view, &view_context) + })) } fn name(&self) -> Option<&str> { @@ -717,63 +721,6 @@ impl AnyRootElement for RootElement { } } -impl Element for RootElement { - type LayoutState = (); - type PaintState = (); - - fn layout( - &mut self, - constraint: SizeConstraint, - _view: &mut V, - cx: &mut ViewContext, - ) -> (Vector2F, ()) { - let size = AnyRootElement::layout(self, constraint, cx) - .log_err() - .unwrap_or_else(|| Vector2F::zero()); - (size, ()) - } - - fn paint( - &mut self, - scene: &mut SceneBuilder, - bounds: RectF, - visible_bounds: RectF, - _layout: &mut Self::LayoutState, - _view: &mut V, - cx: &mut ViewContext, - ) { - AnyRootElement::paint(self, scene, bounds.origin(), visible_bounds, cx).log_err(); - } - - fn rect_for_text_range( - &self, - range_utf16: Range, - _bounds: RectF, - _visible_bounds: RectF, - _layout: &Self::LayoutState, - _paint: &Self::PaintState, - _view: &V, - cx: &ViewContext, - ) -> Option { - AnyRootElement::rect_for_text_range(self, range_utf16, cx) - .log_err() - .flatten() - } - - fn debug( - &self, - _bounds: RectF, - _layout: &Self::LayoutState, - _paint: &Self::PaintState, - _view: &V, - cx: &ViewContext, - ) -> serde_json::Value { - AnyRootElement::debug(self, cx) - .log_err() - .unwrap_or_default() - } -} - pub trait ParentElement<'a, V: View>: Extend> + Sized { fn add_children>(&mut self, children: impl IntoIterator) { self.extend(children.into_iter().map(|child| child.into_any())); diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs index 4325835cdbe09d8573dff129ac9112c1b8323f75..446a493692df638a4a96af19d490bbf98178a9f1 100644 --- a/crates/zed/src/zed.rs +++ b/crates/zed/src/zed.rs @@ -11,6 +11,7 @@ use collections::VecDeque; pub use editor; use editor::{Editor, MultiBuffer}; +use anyhow::anyhow; use feedback::{ feedback_info_text::FeedbackInfoText, submit_feedback_button::SubmitFeedbackButton, }; @@ -223,9 +224,14 @@ pub fn init(app_state: &Arc, cx: &mut gpui::AppContext) { move |_: &mut Workspace, _: &DebugElements, cx: &mut ViewContext| { let app_state = app_state.clone(); let markdown = app_state.languages.language_for_name("JSON"); - let content = to_string_pretty(&cx.debug_elements()).unwrap(); + let window_id = cx.window_id(); cx.spawn(|workspace, mut cx| async move { let markdown = markdown.await.log_err(); + let content = to_string_pretty( + &cx.debug_elements(window_id) + .ok_or_else(|| anyhow!("could not debug elements for {window_id}"))?, + ) + .unwrap(); workspace .update(&mut cx, |workspace, cx| { workspace.with_local_workspace(&app_state, cx, move |workspace, cx| {