From 457da7b27c4c2a2050eccab679fd1f86b00a7e5a Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Wed, 17 Jul 2024 18:58:44 -0400 Subject: [PATCH] breadcrumbs: Use early return in `set_active_pane_item` (#14691) This PR refactors the `set_active_pane_item` implementation for `Breadcrumbs` to use an early return to avoid indenting the method body more than necessary. Release Notes: - N/A --- crates/breadcrumbs/src/breadcrumbs.rs | 47 ++++++++++++++------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/crates/breadcrumbs/src/breadcrumbs.rs b/crates/breadcrumbs/src/breadcrumbs.rs index ae462b9f1a..ae8469ed41 100644 --- a/crates/breadcrumbs/src/breadcrumbs.rs +++ b/crates/breadcrumbs/src/breadcrumbs.rs @@ -113,29 +113,30 @@ impl ToolbarItemView for Breadcrumbs { ) -> ToolbarItemLocation { cx.notify(); self.active_item = None; - if let Some(item) = active_pane_item { - let this = cx.view().downgrade(); - self.subscription = Some(item.subscribe_to_item_events( - cx, - Box::new(move |event, cx| { - if let ItemEvent::UpdateBreadcrumbs = event { - this.update(cx, |this, cx| { - cx.notify(); - if let Some(active_item) = this.active_item.as_ref() { - cx.emit(ToolbarItemEvent::ChangeLocation( - active_item.breadcrumb_location(cx), - )) - } - }) - .ok(); - } - }), - )); - self.active_item = Some(item.boxed_clone()); - item.breadcrumb_location(cx) - } else { - ToolbarItemLocation::Hidden - } + + let Some(item) = active_pane_item else { + return ToolbarItemLocation::Hidden; + }; + + let this = cx.view().downgrade(); + self.subscription = Some(item.subscribe_to_item_events( + cx, + Box::new(move |event, cx| { + if let ItemEvent::UpdateBreadcrumbs = event { + this.update(cx, |this, cx| { + cx.notify(); + if let Some(active_item) = this.active_item.as_ref() { + cx.emit(ToolbarItemEvent::ChangeLocation( + active_item.breadcrumb_location(cx), + )) + } + }) + .ok(); + } + }), + )); + self.active_item = Some(item.boxed_clone()); + item.breadcrumb_location(cx) } fn pane_focus_update(&mut self, pane_focused: bool, _: &mut ViewContext) {