From 258496700f13a24ded2cac8725557b9d7e04b7e9 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 25 Oct 2023 16:02:47 +0200
Subject: [PATCH] Rename `theme` getter to `old_theme`

---
 crates/ui2/src/color.rs                | 8 ++++----
 crates/ui2/src/components/workspace.rs | 4 ++--
 crates/ui2/src/elements/icon.rs        | 4 ++--
 crates/ui2/src/elements/label.rs       | 4 ++--
 crates/ui2/src/prelude.rs              | 2 +-
 crates/ui2/src/theme.rs                | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/crates/ui2/src/color.rs b/crates/ui2/src/color.rs
index 51bf0003cb13149708f7377b0bbf871f37a1ac33..dcca95ae961aa91060348633d68eacdc8037f316 100644
--- a/crates/ui2/src/color.rs
+++ b/crates/ui2/src/color.rs
@@ -1,5 +1,5 @@
 use crate::theme2;
-pub use crate::{theme, ButtonVariant, ElementExt, Theme};
+pub use crate::{old_theme, ButtonVariant, ElementExt, Theme};
 use gpui2::{hsla, rgb, Hsla, WindowContext};
 use strum::EnumIter;
 
@@ -20,7 +20,7 @@ impl std::fmt::Debug for PlayerThemeColors {
 
 impl PlayerThemeColors {
     pub fn new(cx: &WindowContext, ix: usize) -> Self {
-        let theme = theme(cx);
+        let theme = old_theme(cx);
 
         if ix < theme.players.len() {
             Self {
@@ -57,7 +57,7 @@ impl std::fmt::Debug for SyntaxColor {
 
 impl SyntaxColor {
     pub fn new(cx: &WindowContext) -> Self {
-        let theme = theme(cx);
+        let theme = old_theme(cx);
 
         Self {
             comment: theme
@@ -253,7 +253,7 @@ impl std::fmt::Debug for ThemeColor {
 
 impl ThemeColor {
     pub fn new(cx: &WindowContext) -> Self {
-        let theme = theme(cx);
+        let theme = old_theme(cx);
         let theme2 = theme2(cx);
         let transparent = hsla(0.0, 0.0, 0.0, 0.0);
 
diff --git a/crates/ui2/src/components/workspace.rs b/crates/ui2/src/components/workspace.rs
index ff51220053d8946d1e0488627c8d8758b676fe8f..e26ce6d659e5628cefdf6f23d5d3fe49afe720d4 100644
--- a/crates/ui2/src/components/workspace.rs
+++ b/crates/ui2/src/components/workspace.rs
@@ -5,7 +5,7 @@ use gpui2::{px, relative, rems, view, Context, Size, View};
 
 use crate::{prelude::*, NotificationsPanel};
 use crate::{
-    static_livestream, theme, user_settings_mut, v_stack, AssistantPanel, Button, ChatMessage,
+    static_livestream, old_theme, user_settings_mut, v_stack, AssistantPanel, Button, ChatMessage,
     ChatPanel, CollabPanel, EditorPane, FakeSettings, Label, LanguageSelector, Pane, PaneGroup,
     Panel, PanelAllowedSides, PanelSide, ProjectPanel, SettingValue, SplitDirection, StatusBar,
     Terminal, TitleBar, Toast, ToastOrigin,
@@ -175,7 +175,7 @@ impl Workspace {
     }
 
     pub fn render(&mut self, cx: &mut ViewContext<Self>) -> impl Element<ViewState = Self> {
-        let theme = theme(cx).clone();
+        let theme = old_theme(cx).clone();
 
         let color = ThemeColor::new(cx);
 
diff --git a/crates/ui2/src/elements/icon.rs b/crates/ui2/src/elements/icon.rs
index e89309b5e6a12bca818298b2223d269b7985de4c..9f2d174accc9fe5d88210185cb1d494306f17290 100644
--- a/crates/ui2/src/elements/icon.rs
+++ b/crates/ui2/src/elements/icon.rs
@@ -4,7 +4,7 @@ use gpui2::{svg, Hsla};
 use strum::EnumIter;
 
 use crate::prelude::*;
-use crate::theme::theme;
+use crate::theme::old_theme;
 
 #[derive(Default, PartialEq, Copy, Clone)]
 pub enum IconSize {
@@ -29,7 +29,7 @@ pub enum IconColor {
 
 impl IconColor {
     pub fn color(self, cx: &WindowContext) -> Hsla {
-        let theme = theme(cx);
+        let theme = old_theme(cx);
         match self {
             IconColor::Default => theme.lowest.base.default.foreground,
             IconColor::Muted => theme.lowest.variant.default.foreground,
diff --git a/crates/ui2/src/elements/label.rs b/crates/ui2/src/elements/label.rs
index c57de26dd7786632a9ebabcd8d11170bc08617c0..bea301c1c2166c84844c0c9807e21c6d2ba30191 100644
--- a/crates/ui2/src/elements/label.rs
+++ b/crates/ui2/src/elements/label.rs
@@ -4,7 +4,7 @@ use gpui2::{relative, Hsla, WindowContext};
 use smallvec::SmallVec;
 
 use crate::prelude::*;
-use crate::theme::theme;
+use crate::theme::old_theme;
 
 #[derive(Default, PartialEq, Copy, Clone)]
 pub enum LabelColor {
@@ -24,7 +24,7 @@ impl LabelColor {
     pub fn hsla(&self, cx: &WindowContext) -> Hsla {
         let color = ThemeColor::new(cx);
         // TODO: Remove
-        let theme = theme(cx);
+        let theme = old_theme(cx);
 
         match self {
             Self::Default => color.text,
diff --git a/crates/ui2/src/prelude.rs b/crates/ui2/src/prelude.rs
index 05f21f0a249b3b1567f0eaafdd87dd861985da0b..8b8ad30b919bb2595dc9a2a12636cbd53e703518 100644
--- a/crates/ui2/src/prelude.rs
+++ b/crates/ui2/src/prelude.rs
@@ -6,7 +6,7 @@ pub use gpui2::{
 pub use crate::color::*;
 pub use crate::elevation::*;
 use crate::settings::user_settings;
-pub use crate::{theme, ButtonVariant, ElementExt, Theme};
+pub use crate::{old_theme, ButtonVariant, ElementExt, Theme};
 
 use gpui2::{rems, Hsla, Rems};
 use strum::EnumIter;
diff --git a/crates/ui2/src/theme.rs b/crates/ui2/src/theme.rs
index 0448a31db948add426b3ae67593525370445c230..e921019e7032503e44068d2459162e808f051531 100644
--- a/crates/ui2/src/theme.rs
+++ b/crates/ui2/src/theme.rs
@@ -214,7 +214,7 @@ where
     }
 }
 
-pub fn theme(cx: &WindowContext) -> Arc<Theme> {
+pub fn old_theme(cx: &WindowContext) -> Arc<Theme> {
     Arc::new(cx.global::<Theme>().clone())
 }