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

Log view name alongside error in ChildView

Browse Source
This commit is contained in:
Antonio Scandurra 2022-10-13 15:40:21 +02:00
parent edb61a9c8f
commit a5a60eb854
29 changed files with 105 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/chat_panel/src/chat_panel.rs
View File

@ -200,7 +200,7 @@ impl ChatPanel {
let theme = &cx.global::<Settings>().theme;
Flex::column()
.with_child(
Container::new(ChildView::new(&self.channel_select).boxed())
Container::new(ChildView::new(&self.channel_select, cx).boxed())
.with_style(theme.chat_panel.channel_select.container)
.boxed(),
)
@ -265,7 +265,7 @@ impl ChatPanel {
fn render_input_box(&self, cx: &AppContext) -> ElementBox {
let theme = &cx.global::<Settings>().theme;
Container::new(ChildView::new(&self.input_editor).boxed())
Container::new(ChildView::new(&self.input_editor, cx).boxed())
.with_style(theme.chat_panel.input_editor.container)
.boxed()
}

2
crates/collab/src/integration_tests.rs
View File

@ -25,7 +25,7 @@ use gpui::{
};
use language::{
range_to_lsp, tree_sitter_rust, Diagnostic, DiagnosticEntry, FakeLspAdapter, Language,
LanguageConfig, LanguageRegistry, OffsetRangeExt, Rope, Point,
LanguageConfig, LanguageRegistry, OffsetRangeExt, Point, Rope,
};
use lsp::{self, FakeLanguageServer};
use parking_lot::Mutex;

2
crates/collab_ui/src/collab_titlebar_item.rs
View File

@ -223,7 +223,7 @@ impl CollabTitlebarItem {
.with_children(badge)
.with_children(self.contacts_popover.as_ref().map(|popover| {
Overlay::new(
ChildView::new(popover)
ChildView::new(popover, cx)
.contained()
.with_margin_top(titlebar.height)
.with_margin_left(titlebar.toggle_contacts_button.default.button_width)

4
crates/collab_ui/src/contact_finder.rs
View File

@ -32,8 +32,8 @@ impl View for ContactFinder {
"ContactFinder"
}
fn render(&mut self, _: &mut RenderContext<Self>) -> ElementBox {
ChildView::new(self.picker.clone()).boxed()
fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
ChildView::new(self.picker.clone(), cx).boxed()
}
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {

2
crates/collab_ui/src/contact_list.rs
View File

@ -1072,7 +1072,7 @@ impl View for ContactList {
.with_child(
Flex::row()
.with_child(
ChildView::new(self.filter_editor.clone())
ChildView::new(self.filter_editor.clone(), cx)
.contained()
.with_style(theme.contact_list.user_query_editor.container)
.flex(1., true)

4
crates/collab_ui/src/contacts_popover.rs
View File

@ -88,8 +88,8 @@ impl View for ContactsPopover {
fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
let theme = cx.global::<Settings>().theme.clone();
let child = match &self.child {
Child::ContactList(child) => ChildView::new(child),
Child::ContactFinder(child) => ChildView::new(child),
Child::ContactList(child) => ChildView::new(child, cx),
Child::ContactFinder(child) => ChildView::new(child, cx),
};
MouseEventHandler::<ContactsPopover>::new(0, cx, |_, cx| {

8
crates/command_palette/src/command_palette.rs
View File

@ -4,8 +4,8 @@ use gpui::{
actions,
elements::{ChildView, Flex, Label, ParentElement},
keymap::Keystroke,
Action, AnyViewHandle, Element, Entity, MouseState, MutableAppContext, View, ViewContext,
ViewHandle,
Action, AnyViewHandle, Element, Entity, MouseState, MutableAppContext, RenderContext, View,
ViewContext, ViewHandle,
};
use picker::{Picker, PickerDelegate};
use settings::Settings;
@ -131,8 +131,8 @@ impl View for CommandPalette {
"CommandPalette"
}
fn render(&mut self, _: &mut gpui::RenderContext<'_, Self>) -> gpui::ElementBox {
ChildView::new(self.picker.clone()).boxed()
fn render(&mut self, cx: &mut RenderContext<Self>) -> gpui::ElementBox {
ChildView::new(self.picker.clone(), cx).boxed()
}
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {

2
crates/diagnostics/src/diagnostics.rs
View File

@ -95,7 +95,7 @@ impl View for ProjectDiagnosticsEditor {
.with_style(theme.container)
.boxed()
} else {
ChildView::new(&self.editor).boxed()
ChildView::new(&self.editor, cx).boxed()
}
}

4
crates/editor/src/editor.rs
View File

@ -5206,7 +5206,7 @@ impl Editor {
render: Arc::new({
let editor = rename_editor.clone();
move |cx: &mut BlockContext| {
ChildView::new(editor.clone())
ChildView::new(editor.clone(), cx)
.contained()
.with_padding_left(cx.anchor_x)
.boxed()
@ -6270,7 +6270,7 @@ impl View for Editor {
.with_child(
EditorElement::new(self.handle.clone(), style.clone(), self.cursor_shape).boxed(),
)
.with_child(ChildView::new(&self.mouse_context_menu).boxed())
.with_child(ChildView::new(&self.mouse_context_menu, cx).boxed())
.boxed()
}

4
crates/file_finder/src/file_finder.rs
View File

@ -49,8 +49,8 @@ impl View for FileFinder {
"FileFinder"
}
fn render(&mut self, _: &mut RenderContext<Self>) -> ElementBox {
ChildView::new(self.picker.clone()).boxed()
fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
ChildView::new(self.picker.clone(), cx).boxed()
}
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {

2
crates/go_to_line/src/go_to_line.rs
View File

@ -165,7 +165,7 @@ impl View for GoToLine {
Container::new(
Flex::new(Axis::Vertical)
.with_child(
Container::new(ChildView::new(&self.line_editor).boxed())
Container::new(ChildView::new(&self.line_editor, cx).boxed())
.with_style(theme.input_editor.container)
.boxed(),
)

8
crates/gpui/src/app.rs
View File

@ -2571,6 +2571,10 @@ impl AppContext {
.and_then(|window| window.focused_view_id)
}
pub fn view_ui_name(&self, window_id: usize, view_id: usize) -> Option<&'static str> {
Some(self.views.get(&(window_id, view_id))?.ui_name())
}
pub fn background(&self) -> &Arc<executor::Background> {
&self.background
}
@ -4416,6 +4420,10 @@ impl AnyViewHandle {
}
}
pub fn window_id(&self) -> usize {
self.window_id
}
pub fn id(&self) -> usize {
self.view_id
}

31
crates/gpui/src/presenter.rs
View File

@ -973,12 +973,16 @@ impl ToJson for SizeConstraint {
pub struct ChildView {
view: AnyWeakViewHandle,
view_name: &'static str,
}
impl ChildView {
pub fn new(view: impl Into<AnyViewHandle>) -> Self {
pub fn new(view: impl Into<AnyViewHandle>, cx: &AppContext) -> Self {
let view = view.into();
let view_name = cx.view_ui_name(view.window_id(), view.id()).unwrap();
Self {
view: view.into().downgrade(),
view: view.downgrade(),
view_name,
}
}
}
@ -996,7 +1000,11 @@ impl Element for ChildView {
let size = cx.layout(self.view.id(), constraint);
(size, true)
} else {
log::error!("layout called on a view that was not rendered");
log::error!(
"layout called on a view (id: {}, name: {:?}) that was not rendered",
self.view.id(),
self.view_name
);
(Vector2F::zero(), false)
}
}
@ -1011,7 +1019,11 @@ impl Element for ChildView {
if *view_is_valid {
cx.paint(self.view.id(), bounds.origin(), visible_bounds);
} else {
log::error!("paint called on a view that was not rendered");
log::error!(
"paint called on a view (id: {}, name: {:?}) that was not rendered",
self.view.id(),
self.view_name
);
}
}
@ -1027,7 +1039,11 @@ impl Element for ChildView {
if *view_is_valid {
cx.dispatch_event(self.view.id(), event)
} else {
log::error!("dispatch_event called on a view that was not rendered");
log::error!(
"dispatch_event called on a view (id: {}, name: {:?}) that was not rendered",
self.view.id(),
self.view_name
);
false
}
}
@ -1044,6 +1060,11 @@ impl Element for ChildView {
if *view_is_valid {
cx.rect_for_text_range(self.view.id(), range_utf16)
} else {
log::error!(
"rect_for_text_range called on a view (id: {}, name: {:?}) that was not rendered",
self.view.id(),
self.view_name
);
None
}
}

4
crates/outline/src/outline.rs
View File

@ -48,8 +48,8 @@ impl View for OutlineView {
"OutlineView"
}
fn render(&mut self, _: &mut RenderContext<Self>) -> ElementBox {
ChildView::new(self.picker.clone()).boxed()
fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
ChildView::new(self.picker.clone(), cx).boxed()
}
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {

2
crates/picker/src/picker.rs
View File

@ -63,7 +63,7 @@ impl<D: PickerDelegate> View for Picker<D> {
Flex::new(Axis::Vertical)
.with_child(
ChildView::new(&self.query_editor)
ChildView::new(&self.query_editor, cx)
.contained()
.with_style(theme.input_editor.container)
.boxed(),

6
crates/project_panel/src/project_panel.rs
View File

@ -1012,7 +1012,7 @@ impl ProjectPanel {
) -> ElementBox {
let kind = details.kind;
let show_editor = details.is_editing && !details.is_processing;
MouseEventHandler::<Self>::new(entry_id.to_usize(), cx, |state, _| {
MouseEventHandler::<Self>::new(entry_id.to_usize(), cx, |state, cx| {
let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width;
let mut style = theme.entry.style_for(state, details.is_selected).clone();
if details.is_ignored {
@ -1051,7 +1051,7 @@ impl ProjectPanel {
.boxed(),
)
.with_child(if show_editor {
ChildView::new(editor.clone())
ChildView::new(editor.clone(), cx)
.contained()
.with_margin_left(theme.entry.default.icon_spacing)
.aligned()
@ -1147,7 +1147,7 @@ impl View for ProjectPanel {
})
.boxed(),
)
.with_child(ChildView::new(&self.context_menu).boxed())
.with_child(ChildView::new(&self.context_menu, cx).boxed())
.boxed()
}

4
crates/project_symbols/src/project_symbols.rs
View File

@ -47,8 +47,8 @@ impl View for ProjectSymbolsView {
"ProjectSymbolsView"
}
fn render(&mut self, _: &mut RenderContext<Self>) -> ElementBox {
ChildView::new(self.picker.clone()).boxed()
fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
ChildView::new(self.picker.clone(), cx).boxed()
}
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {

2
crates/search/src/buffer_search.rs
View File

@ -105,7 +105,7 @@ impl View for BufferSearchBar {
.with_child(
Flex::row()
.with_child(
ChildView::new(&self.query_editor)
ChildView::new(&self.query_editor, cx)
.aligned()
.left()
.flex(1., true)

6
crates/search/src/project_search.rs
View File

@ -189,7 +189,9 @@ impl View for ProjectSearchView {
})
.boxed()
} else {
ChildView::new(&self.results_editor).flex(1., true).boxed()
ChildView::new(&self.results_editor, cx)
.flex(1., true)
.boxed()
}
}
@ -824,7 +826,7 @@ impl View for ProjectSearchBar {
.with_child(
Flex::row()
.with_child(
ChildView::new(&search.query_editor)
ChildView::new(&search.query_editor, cx)
.aligned()
.left()
.flex(1., true)

4
crates/terminal/src/terminal_container_view.rs
View File

@ -162,8 +162,8 @@ impl View for TerminalContainer {
fn render(&mut self, cx: &mut gpui::RenderContext<'_, Self>) -> ElementBox {
let child_view = match &self.content {
TerminalContainerContent::Connected(connected) => ChildView::new(connected),
TerminalContainerContent::Error(error) => ChildView::new(error),
TerminalContainerContent::Connected(connected) => ChildView::new(connected, cx),
TerminalContainerContent::Error(error) => ChildView::new(error, cx),
};
if self.modal {
let settings = cx.global::<Settings>();

2
crates/terminal/src/terminal_view.rs
View File

@ -339,7 +339,7 @@ impl View for TerminalView {
.contained()
.boxed(),
)
.with_child(ChildView::new(&self.context_menu).boxed())
.with_child(ChildView::new(&self.context_menu, cx).boxed())
.boxed()
}

4
crates/theme_selector/src/theme_selector.rs
View File

@ -262,8 +262,8 @@ impl View for ThemeSelector {
"ThemeSelector"
}
fn render(&mut self, _: &mut RenderContext<Self>) -> ElementBox {
ChildView::new(self.picker.clone()).boxed()
fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
ChildView::new(self.picker.clone(), cx).boxed()
}
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {

6
crates/workspace/src/dock.rs
View File

@ -255,7 +255,7 @@ impl Dock {
enum DockResizeHandle {}
let resizable = Container::new(ChildView::new(self.pane.clone()).boxed())
let resizable = Container::new(ChildView::new(self.pane.clone(), cx).boxed())
.with_style(panel_style)
.with_resize_handle::<DockResizeHandle, _>(
resize_side as usize,
@ -285,8 +285,8 @@ impl Dock {
enum ExpandedDockPane {}
Container::new(
MouseEventHandler::<ExpandedDockWash>::new(0, cx, |_state, cx| {
MouseEventHandler::<ExpandedDockPane>::new(0, cx, |_state, _cx| {
ChildView::new(self.pane.clone()).boxed()
MouseEventHandler::<ExpandedDockPane>::new(0, cx, |_state, cx| {
ChildView::new(&self.pane, cx).boxed()
})
.capture_all()
.contained()

6
crates/workspace/src/pane.rs
View File

@ -1439,8 +1439,8 @@ impl View for Pane {
.flex(1., false)
.named("tab bar")
})
.with_child(ChildView::new(&self.toolbar).expanded().boxed())
.with_child(ChildView::new(active_item).flex(1., true).boxed())
.with_child(ChildView::new(&self.toolbar, cx).expanded().boxed())
.with_child(ChildView::new(active_item, cx).flex(1., true).boxed())
.boxed()
} else {
enum EmptyPane {}
@ -1480,7 +1480,7 @@ impl View for Pane {
})
.boxed(),
)
.with_child(ChildView::new(&self.tab_bar_context_menu).boxed())
.with_child(ChildView::new(&self.tab_bar_context_menu, cx).boxed())
.named("pane")
}

7
crates/workspace/src/pane_group.rs
View File

@ -222,7 +222,12 @@ impl Member {
};
Stack::new()
.with_child(ChildView::new(pane).contained().with_border(border).boxed())
.with_child(
ChildView::new(pane, cx)
.contained()
.with_border(border)
.boxed(),
)
.with_children(prompt)
.boxed()
}

2
crates/workspace/src/sidebar.rs
View File

@ -192,7 +192,7 @@ impl View for Sidebar {
if let Some(active_item) = self.active_item() {
enum ResizeHandleTag {}
let style = &cx.global::<Settings>().theme.workspace.sidebar;
ChildView::new(active_item.to_any())
ChildView::new(active_item.to_any(), cx)
.contained()
.with_style(style.container)
.with_resize_handle::<ResizeHandleTag, _>(

4
crates/workspace/src/status_bar.rs
View File

@ -42,14 +42,14 @@ impl View for StatusBar {
let theme = &cx.global::<Settings>().theme.workspace.status_bar;
Flex::row()
.with_children(self.left_items.iter().map(|i| {
ChildView::new(i.as_ref())
ChildView::new(i.as_ref(), cx)
.aligned()
.contained()
.with_margin_right(theme.item_spacing)
.boxed()
}))
.with_children(self.right_items.iter().rev().map(|i| {
ChildView::new(i.as_ref())
ChildView::new(i.as_ref(), cx)
.aligned()
.contained()
.with_margin_left(theme.item_spacing)

6
crates/workspace/src/toolbar.rs
View File

@ -67,7 +67,7 @@ impl View for Toolbar {
match *position {
ToolbarItemLocation::Hidden => {}
ToolbarItemLocation::PrimaryLeft { flex } => {
let left_item = ChildView::new(item.as_ref())
let left_item = ChildView::new(item.as_ref(), cx)
.aligned()
.contained()
.with_margin_right(spacing);
@ -78,7 +78,7 @@ impl View for Toolbar {
}
}
ToolbarItemLocation::PrimaryRight { flex } => {
let right_item = ChildView::new(item.as_ref())
let right_item = ChildView::new(item.as_ref(), cx)
.aligned()
.contained()
.with_margin_left(spacing)
@ -91,7 +91,7 @@ impl View for Toolbar {
}
ToolbarItemLocation::Secondary => {
secondary_item = Some(
ChildView::new(item.as_ref())
ChildView::new(item.as_ref(), cx)
.constrained()
.with_height(theme.height)
.boxed(),

26
crates/workspace/src/workspace.rs
View File

@ -2126,7 +2126,7 @@ impl Workspace {
enum TitleBar {}
ConstrainedBox::new(
MouseEventHandler::<TitleBar>::new(0, cx, |_, _| {
MouseEventHandler::<TitleBar>::new(0, cx, |_, cx| {
Container::new(
Stack::new()
.with_child(
@ -2138,7 +2138,7 @@ impl Workspace {
.with_children(
self.titlebar_item
.as_ref()
.map(|item| ChildView::new(item).aligned().right().boxed()),
.map(|item| ChildView::new(item, cx).aligned().right().boxed()),
)
.boxed(),
)
@ -2231,14 +2231,18 @@ impl Workspace {
}
}
fn render_notifications(&self, theme: &theme::Workspace) -> Option<ElementBox> {
fn render_notifications(
&self,
theme: &theme::Workspace,
cx: &AppContext,
) -> Option<ElementBox> {
if self.notifications.is_empty() {
None
} else {
Some(
Flex::column()
.with_children(self.notifications.iter().map(|(_, _, notification)| {
ChildView::new(notification.as_ref())
ChildView::new(notification.as_ref(), cx)
.contained()
.with_style(theme.notification)
.boxed()
@ -2570,7 +2574,7 @@ impl View for Workspace {
.with_children(
if self.left_sidebar.read(cx).active_item().is_some() {
Some(
ChildView::new(&self.left_sidebar)
ChildView::new(&self.left_sidebar, cx)
.flex(0.8, false)
.boxed(),
)
@ -2606,7 +2610,7 @@ impl View for Workspace {
.with_children(
if self.right_sidebar.read(cx).active_item().is_some() {
Some(
ChildView::new(&self.right_sidebar)
ChildView::new(&self.right_sidebar, cx)
.flex(0.8, false)
.boxed(),
)
@ -2624,15 +2628,17 @@ impl View for Workspace {
DockAnchor::Expanded,
cx,
))
.with_children(self.modal.as_ref().map(|m| {
ChildView::new(m)
.with_children(self.modal.as_ref().map(|modal| {
ChildView::new(modal, cx)
.contained()
.with_style(theme.workspace.modal)
.aligned()
.top()
.boxed()
}))
.with_children(self.render_notifications(&theme.workspace))
.with_children(
self.render_notifications(&theme.workspace, cx),
)
.boxed(),
)
.boxed(),
@ -2640,7 +2646,7 @@ impl View for Workspace {
.flex(1.0, true)
.boxed(),
)
.with_child(ChildView::new(&self.status_bar).boxed())
.with_child(ChildView::new(&self.status_bar, cx).boxed())
.contained()
.with_background_color(theme.workspace.background)
.boxed(),