Checkpoint

crates/ui2/src/components/assistant_panel.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{rems, AbsoluteLength};
+use gpui2::{rems, AbsoluteLength};
 
 use crate::prelude::*;
 use crate::{Icon, IconButton, Label, Panel, PanelSide};

crates/ui2/src/components/breadcrumb.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 use std::path::PathBuf;
 
-use gpui3::Div;
+use gpui2::Div;
 
 use crate::prelude::*;
 use crate::{h_stack, HighlightedText};

crates/ui2/src/components/buffer.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{Hsla, WindowContext};
+use gpui2::{Hsla, WindowContext};
 
 use crate::prelude::*;
 use crate::{h_stack, v_stack, Icon, IconElement};
@@ -238,7 +238,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui3::rems;
+    use gpui2::rems;
 
     use crate::{
         empty_buffer_example, hello_world_rust_buffer_example,

crates/ui2/src/components/buffer_search.rs

@@ -1,4 +1,4 @@
-use gpui3::{view, Context, View};
+use gpui2::{view, Context, View};
 
 use crate::prelude::*;
 use crate::{h_stack, Icon, IconButton, IconColor, Input};

crates/ui2/src/components/collab_panel.rs

@@ -3,7 +3,7 @@ use crate::{
     static_collab_panel_channels, static_collab_panel_current_call, v_stack, Icon, List,
     ListHeader, ToggleState,
 };
-use gpui3::{img, svg, SharedString};
+use gpui2::{img, svg, SharedString};
 use std::marker::PhantomData;
 
 #[derive(Element)]

crates/ui2/src/components/editor_pane.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use gpui3::{view, Context, View};
+use gpui2::{view, Context, View};
 
 use crate::prelude::*;
 use crate::{

crates/ui2/src/components/icon_button.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 use std::sync::Arc;
 
-use gpui3::MouseButton;
+use gpui2::MouseButton;
 
 use crate::{h_stack, prelude::*};
 use crate::{ClickHandler, Icon, IconColor, IconElement};

crates/ui2/src/components/list.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{div, relative, Div};
+use gpui2::{div, relative, Div};
 
 use crate::settings::user_settings;
 use crate::{

crates/ui2/src/components/notification_toast.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::rems;
+use gpui2::rems;
 
 use crate::{h_stack, prelude::*, Icon};
 

crates/ui2/src/components/palette.rs

@@ -152,7 +152,7 @@ impl<S: 'static + Send + Sync> PaletteItem<S> {
     }
 }
 
-use gpui3::ElementId;
+use gpui2::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 

crates/ui2/src/components/panel.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{AbsoluteLength, AnyElement};
+use gpui2::{AbsoluteLength, AnyElement};
 use smallvec::SmallVec;
 
 use crate::prelude::*;

crates/ui2/src/components/panes.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{hsla, AnyElement, ElementId, Hsla, Length, Size};
+use gpui2::{hsla, AnyElement, ElementId, Hsla, Length, Size};
 use smallvec::SmallVec;
 
 use crate::prelude::*;

crates/ui2/src/components/project_panel.rs

@@ -58,7 +58,7 @@ impl<S: 'static + Send + Sync> ProjectPanel<S> {
     }
 }
 
-use gpui3::ElementId;
+use gpui2::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 

crates/ui2/src/components/tab.rs

@@ -148,7 +148,7 @@ impl<S: 'static + Send + Sync + Clone> Tab<S> {
     }
 }
 
-use gpui3::ElementId;
+use gpui2::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 

crates/ui2/src/components/tab_bar.rs

@@ -90,7 +90,7 @@ impl<S: 'static + Send + Sync + Clone> TabBar<S> {
     }
 }
 
-use gpui3::ElementId;
+use gpui2::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 

crates/ui2/src/components/terminal.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{relative, rems, Size};
+use gpui2::{relative, rems, Size};
 
 use crate::prelude::*;
 use crate::{Icon, IconButton, Pane, Tab};

crates/ui2/src/components/title_bar.rs

@@ -1,7 +1,7 @@
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
-use gpui3::{view, Context, View};
+use gpui2::{view, Context, View};
 
 use crate::prelude::*;
 use crate::settings::user_settings;

crates/ui2/src/components/toast.rs

@@ -1,4 +1,4 @@
-use gpui3::AnyElement;
+use gpui2::AnyElement;
 use smallvec::SmallVec;
 
 use crate::prelude::*;

crates/ui2/src/components/toolbar.rs

@@ -1,4 +1,4 @@
-use gpui3::AnyElement;
+use gpui2::AnyElement;
 use smallvec::SmallVec;
 
 use crate::prelude::*;

crates/ui2/src/components/workspace.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use chrono::DateTime;
-use gpui3::{px, relative, rems, view, Context, Size, View};
+use gpui2::{px, relative, rems, view, Context, Size, View};
 
 use crate::{prelude::*, NotificationsPanel};
 use crate::{

crates/ui2/src/element_ext.rs

@@ -1,4 +1,4 @@
-use gpui3::Element;
+use gpui2::Element;
 
 pub trait ElementExt<S: 'static + Send + Sync>: Element<ViewState = S> {
     /// Applies a given function `then` to the current element if `condition` is true.

crates/ui2/src/elements/avatar.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::img;
+use gpui2::img;
 
 use crate::prelude::*;
 

crates/ui2/src/elements/button.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 use std::sync::Arc;
 
-use gpui3::{DefiniteLength, Hsla, MouseButton, WindowContext};
+use gpui2::{DefiniteLength, Hsla, MouseButton, WindowContext};
 
 use crate::settings::user_settings;
 use crate::{h_stack, Icon, IconColor, IconElement, Label, LabelColor};
@@ -227,7 +227,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui3::rems;
+    use gpui2::rems;
     use strum::IntoEnumIterator;
 
     use crate::{h_stack, v_stack, LabelColor, Story};

crates/ui2/src/elements/icon.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{svg, Hsla};
+use gpui2::{svg, Hsla};
 use strum::EnumIter;
 
 use crate::prelude::*;

crates/ui2/src/elements/label.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use gpui3::{relative, Hsla, WindowContext};
+use gpui2::{relative, Hsla, WindowContext};
 use smallvec::SmallVec;
 
 use crate::prelude::*;

crates/ui2/src/elements/player.rs

@@ -1,4 +1,4 @@
-use gpui3::{Hsla, ViewContext};
+use gpui2::{Hsla, ViewContext};
 
 use crate::ThemeColor;
 

crates/ui2/src/elements/stack.rs

@@ -1,4 +1,4 @@
-use gpui3::{div, Div};
+use gpui2::{div, Div};
 
 use crate::prelude::*;
 

crates/ui2/src/lib.rs

@@ -16,7 +16,7 @@ pub use static_data::*;
 
 // This needs to be fully qualified with `crate::` otherwise we get a panic
 // at:
-//   thread '<unnamed>' panicked at crates/gpui3/src/platform/mac/platform.rs:66:81:
+//   thread '<unnamed>' panicked at crates/gpui2/src/platform/mac/platform.rs:66:81:
 //   called `Option::unwrap()` on a `None` value
 //
 // AFAICT this is something to do with conflicting names between crates and modules that

crates/ui2/src/prelude.rs

@@ -1,4 +1,4 @@
-pub use gpui3::{
+pub use gpui2::{
     div, Element, ElementId, IntoAnyElement, ParentElement, SharedString, StatefulInteractive,
     StatelessInteractive, Styled, ViewContext, WindowContext,
 };
@@ -6,7 +6,7 @@ pub use gpui3::{
 use crate::settings::user_settings;
 pub use crate::{theme, ButtonVariant, ElementExt, Theme};
 
-use gpui3::{hsla, rems, rgb, Hsla, Rems};
+use gpui2::{hsla, rems, rgb, Hsla, Rems};
 use strum::EnumIter;
 
 // TODO Remove uses in favor of ThemeColor

crates/ui2/src/settings.rs

@@ -1,6 +1,6 @@
 use std::ops::Deref;
 
-use gpui3::{
+use gpui2::{
     rems, AbsoluteLength, AnyElement, BorrowAppContext, Bounds, LayoutId, Pixels, WindowContext,
 };
 
@@ -104,7 +104,7 @@ impl<E: Element> Element for WithSettings<E> {
     type ViewState = E::ViewState;
     type ElementState = E::ElementState;
 
-    fn id(&self) -> Option<gpui3::ElementId> {
+    fn id(&self) -> Option<gpui2::ElementId> {
         None
     }
 

crates/ui2/src/static_data.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 use std::str::FromStr;
 
-use gpui3::WindowContext;
+use gpui2::WindowContext;
 use rand::Rng;
 
 use crate::{

crates/ui2/src/story.rs

@@ -1,4 +1,4 @@
-use gpui3::Div;
+use gpui2::Div;
 
 use crate::prelude::*;
 

crates/ui2/src/theme.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::fmt;
 use std::sync::Arc;
 
-use gpui3::{
+use gpui2::{
     AnyElement, BorrowAppContext, Bounds, Element, Hsla, IntoAnyElement, LayoutId, Pixels, Result,
     ViewContext, WindowContext,
 };
@@ -160,7 +160,7 @@ impl<E: Element> Element for Themed<E> {
     type ViewState = E::ViewState;
     type ElementState = E::ElementState;
 
-    fn id(&self) -> Option<gpui3::ElementId> {
+    fn id(&self) -> Option<gpui2::ElementId> {
         None
     }