clean up

crates/data/src/sidebar.rs

@@ -10,7 +10,7 @@ use gpui::{
     Styled as _, Window, div,
 };
 use gpui_native_icons::{IconRole, icon};
-use gpui_native_theme::{ActiveTheme as _, Theme};
+use gpui_native_theme::ActiveTheme as _;
 use gpui_native_utils::{nav_key, paint_selectable_row, selectable_label_color};
 
 /// The change reporter, fired with the next selected row by pointer and keys.
@@ -167,8 +167,8 @@ impl RenderOnce for Sidebar {
             .map(|(index, _)| index)
             .collect();
 
-        // Keyboard focus rides the container across frames.
         let focus = gpui_native_utils::focus_handle(&self.id, window, cx);
+        let theme = cx.theme();
 
         let label = self
             .a11y_label
@@ -176,14 +176,12 @@ impl RenderOnce for Sidebar {
             .unwrap_or_else(|| SharedString::from(self.id.to_string()));
 
         // Entry paint reads the theme through this borrow.
-        let theme = cx.theme();
-
         let children: Vec<AnyElement> = entries
             .iter()
             .enumerate()
             .map(|(index, entry)| {
                 render_entry(
-                    theme,
+                    cx,
                     entry,
                     index,
                     entries.len(),
@@ -223,7 +221,7 @@ impl RenderOnce for Sidebar {
 }
 
 fn render_entry(
-    theme: &Theme,
+    cx: &App,
     entry: &SidebarEntry,
     index: usize,
     count: usize,
@@ -231,6 +229,7 @@ fn render_entry(
     on_change: &Option<ChangeHandler>,
     focus: &FocusHandle,
 ) -> AnyElement {
+    let theme = cx.theme();
     match entry {
         SidebarEntry::Header { label } => div()
             .px_2()
@@ -247,7 +246,7 @@ fn render_entry(
             detail,
             disabled: row_disabled,
         } => {
-            let label_color = selectable_label_color(theme, selected, *row_disabled);
+            let label_color = selectable_label_color(cx, selected, *row_disabled);
 
             let mut row = div()
                 .id(("sidebar-row", index))
@@ -261,7 +260,7 @@ fn render_entry(
                 .aria_selected(selected)
                 .aria_position_in_set(index + 1)
                 .aria_size_of_set(count)
-                .map(|row| paint_selectable_row(theme, row, selected, *row_disabled));
+                .map(|row| paint_selectable_row(cx, row, selected, *row_disabled));
 
             if !*row_disabled {
                 row = row.cursor_pointer().on_click({