public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though

Browse Source
This commit is contained in:
Ryan Ward
2026-05-07 11:29:34 -05:00
parent f4e2475c60
commit a41cbd8cc7
2433 changed files with 14208 additions and 9409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/code_review/code_review_header/header_revamp.rs
+7 -7
View File
@@ -12,13 +12,13 @@ use crate::code_review::diff_selector::DiffSelector;
use crate::menu::Menu;
use crate::view_components::action_button::ActionButton;
use pathfinder_geometry::vector::vec2f;
use warp_core::features::FeatureFlag;
use warpui::elements::{
use galaxy_core::features::FeatureFlag;
use galaxyui::elements::{
ChildAnchor, ChildView, Clipped, ConstrainedBox, Container, CrossAxisAlignment, Flex,
MainAxisAlignment, MainAxisSize, OffsetPositioning, ParentAnchor, ParentElement,
ParentOffsetBounds, Shrinkable, Stack,
};
use warpui::{Element, ViewHandle};
use galaxyui::{Element, ViewHandle};
use crate::appearance::Appearance;
@@ -89,8 +89,8 @@ impl CodeReviewHeader {
fn render_file_nav_button(button: &ViewHandle<ActionButton>) -> Box<dyn Element> {
ConstrainedBox::new(ChildView::new(button).finish())
.with_height(warp_core::ui::icons::ICON_DIMENSIONS)
.with_width(warp_core::ui::icons::ICON_DIMENSIONS)
.with_height(galaxy_core::ui::icons::ICON_DIMENSIONS)
.with_width(galaxy_core::ui::icons::ICON_DIMENSIONS)
.finish()
}
@@ -142,8 +142,8 @@ impl CodeReviewHeader {
) -> Box<dyn Element> {
let button_container = Container::new(
ConstrainedBox::new(ChildView::new(header_dropdown_button).finish())
.with_height(warp_core::ui::icons::ICON_DIMENSIONS)
.with_width(warp_core::ui::icons::ICON_DIMENSIONS)
.with_height(galaxy_core::ui::icons::ICON_DIMENSIONS)
.with_width(galaxy_core::ui::icons::ICON_DIMENSIONS)
.finish(),
)
.finish();
app/src/code_review/code_review_header/mod.rs
+11 -11
View File
@@ -14,11 +14,11 @@ use crate::{
view_components::action_button::ActionButton,
};
use pathfinder_geometry::vector::vec2f;
use warp_core::features::FeatureFlag;
use warpui::elements::{Hoverable, ParentElement};
use warpui::platform::Cursor;
use warpui::ui_components::components::{Coords, UiComponent};
use warpui::{
use galaxy_core::features::FeatureFlag;
use galaxyui::elements::{Hoverable, ParentElement};
use galaxyui::platform::Cursor;
use galaxyui::ui_components::components::{Coords, UiComponent};
use galaxyui::{
elements::{
Align, ChildAnchor, ChildView, Clipped, ConstrainedBox, Container, CrossAxisAlignment,
Flex, MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor,
@@ -271,7 +271,7 @@ impl CodeReviewHeader {
let header_text = Self::get_header_text(diff_state_model, app);
Container::new(
warpui::elements::Text::new_inline(
galaxyui::elements::Text::new_inline(
header_text,
appearance.ui_font_family(),
appearance.ui_font_size() + 2.,
@@ -329,7 +329,7 @@ impl CodeReviewHeader {
TextAndIcon::new(
TextAndIconAlignment::IconFirst,
"Discard all".to_string(),
Icon::ReverseLeft.to_warpui_icon(warp_core::ui::theme::Fill::Solid(
Icon::ReverseLeft.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(
sub_text_color.into_solid(),
)),
MainAxisSize::Min,
@@ -425,7 +425,7 @@ impl CodeReviewHeader {
.with_text_and_icon_label(TextAndIcon::new(
TextAndIconAlignment::IconFirst,
"",
Icon::Paperclip.to_warpui_icon(warp_core::ui::theme::Fill::Solid(
Icon::Paperclip.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(
theme.main_text_color(theme.background()).into(),
)),
MainAxisSize::Min,
@@ -445,7 +445,7 @@ impl CodeReviewHeader {
.build()
.finish()
})
.with_tooltip_position(warpui::ui_components::button::ButtonTooltipPosition::AboveLeft)
.with_tooltip_position(galaxyui::ui_components::button::ButtonTooltipPosition::AboveLeft)
.build()
.on_click(|ctx, _, _| {
ctx.dispatch_typed_action(CodeReviewAction::AddDiffSetAsContext(
@@ -470,8 +470,8 @@ impl CodeReviewHeader {
) -> Box<dyn Element> {
let button_container = Container::new(
ConstrainedBox::new(ChildView::new(header_dropdown_button).finish())
.with_height(warp_core::ui::icons::ICON_DIMENSIONS)
.with_width(warp_core::ui::icons::ICON_DIMENSIONS)
.with_height(galaxy_core::ui::icons::ICON_DIMENSIONS)
.with_width(galaxy_core::ui::icons::ICON_DIMENSIONS)
.finish(),
)
.with_margin_left(4.)
app/src/code_review/code_review_view.rs
+34 -34
View File
@@ -110,14 +110,14 @@ use itertools::Itertools;
use pathfinder_geometry::rect::RectF;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use rand::{distributions::Alphanumeric, Rng};
use warp_core::{
use galaxy_core::{
channel::{Channel, ChannelState},
features::FeatureFlag,
safe_error, safe_info,
sync_queue::SyncQueue,
ui::theme::color::internal_colors,
};
use warpui::{
use galaxyui::{
clipboard::ClipboardContent,
elements::{
new_scrollable::{
@@ -139,16 +139,16 @@ use warpui::{
units::Pixels,
AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle, WindowId,
};
use warpui::{
use galaxyui::{
elements::{Clipped, MainAxisSize, Shrinkable},
text_layout::{default_compute_baseline_position, ClipConfig},
};
use warpui::{
use galaxyui::{
elements::{Hoverable, SavePosition},
platform::Cursor,
ui_components::components::UiComponent,
};
use warpui::{
use galaxyui::{
fonts::{Properties, Weight},
r#async::SpawnedFutureHandle,
ModelHandle, WeakViewHandle,
@@ -192,14 +192,14 @@ use crate::code::ShowFindReferencesCard;
use crate::code_review::comments::CommentId;
use crate::ui_components::render_file_search_row::{render_file_search_row, FileSearchRowOptions};
use crate::workspace::view::right_panel::{ReviewDestination, ReviewSubmissionResult};
use warp_editor::model::CoreEditorModel;
use galaxy_editor::model::CoreEditorModel;
#[cfg(not(target_family = "wasm"))]
use warp_editor::render::model::AutoScrollMode;
use warp_editor::{
use galaxy_editor::render::model::AutoScrollMode;
use galaxy_editor::{
content::buffer::{AutoScrollBehavior, InitialBufferState, SelectionOffsets},
render::{element::VerticalExpansionBehavior, model::LineCount},
};
use warp_util::{
use galaxy_util::{
content_version::ContentVersion,
file::{FileLoadError, FileSaveError},
path::LineAndColumnArg,
@@ -237,7 +237,7 @@ pub fn render_file_navigation_button<F>(
on_click: F,
) -> Box<dyn Element>
where
F: Fn(&mut warpui::EventContext<'_>) + 'static,
F: Fn(&mut galaxyui::EventContext<'_>) + 'static,
{
let ui_builder = appearance.ui_builder().clone();
let icon_color = appearance
@@ -264,9 +264,9 @@ where
.build()
.finish()
})
.with_tooltip_position(warpui::ui_components::button::ButtonTooltipPosition::BelowLeft)
.with_tooltip_position(galaxyui::ui_components::button::ButtonTooltipPosition::BelowLeft)
.build()
.on_click(move |ctx: &mut warpui::EventContext<'_>, _, _| {
.on_click(move |ctx: &mut galaxyui::EventContext<'_>, _, _| {
on_click(ctx);
});
@@ -3953,7 +3953,7 @@ impl CodeReviewView {
let header_text = "Loading open changes...";
let loading_icon = Icon::Loading
.to_warpui_icon(warp_core::ui::theme::Fill::Solid(
.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(
internal_colors::neutral_6(theme),
))
.finish();
@@ -4091,7 +4091,7 @@ impl CodeReviewView {
Container::new(
ConstrainedBox::new(
Icon::AlertTriangle
.to_warpui_icon(warp_core::ui::theme::Fill::Solid(
.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(
internal_colors::neutral_6(theme),
))
.finish(),
@@ -4149,7 +4149,7 @@ impl CodeReviewView {
.with_text_and_icon_label(TextAndIcon::new(
TextAndIconAlignment::IconFirst,
" Retry".to_string(),
Icon::Refresh.to_warpui_icon(warp_core::ui::theme::Fill::Solid(
Icon::Refresh.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(
theme.main_text_color(theme.background()).into(),
)),
MainAxisSize::Min,
@@ -4201,7 +4201,7 @@ impl CodeReviewView {
Container::new(
ConstrainedBox::new(
Icon::FolderClosed
.to_warpui_icon(warp_core::ui::theme::Fill::Solid(
.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(
internal_colors::neutral_6(theme),
))
.finish(),
@@ -4281,7 +4281,7 @@ impl CodeReviewView {
Container::new(
ConstrainedBox::new(
Icon::FolderClosed
.to_warpui_icon(warp_core::ui::theme::Fill::Solid(
.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(
internal_colors::neutral_6(theme),
))
.finish(),
@@ -4385,7 +4385,7 @@ impl CodeReviewView {
state: &LoadedState,
appearance: &Appearance,
is_in_split_pane: bool,
app: &warpui::AppContext,
app: &galaxyui::AppContext,
) -> Box<dyn Element> {
let top_section = Flex::column()
.with_cross_axis_alignment(CrossAxisAlignment::Start)
@@ -4450,7 +4450,7 @@ impl CodeReviewView {
Container::new(
ConstrainedBox::new(
Icon::Diff
.to_warpui_icon(warp_core::ui::theme::Fill::Solid(
.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(
internal_colors::neutral_6(theme),
))
.finish(),
@@ -4777,7 +4777,7 @@ impl CodeReviewView {
// Add file icon
let file_icon = Icon::File
.to_warpui_icon(warp_core::ui::theme::Fill::Solid(
.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(
internal_colors::neutral_6(theme),
))
.finish();
@@ -4801,7 +4801,7 @@ impl CodeReviewView {
appearance.ui_font_size(),
)
.with_color(
warp_core::ui::theme::Fill::Solid(internal_colors::neutral_6(theme)).into(),
galaxy_core::ui::theme::Fill::Solid(internal_colors::neutral_6(theme)).into(),
)
.with_line_height_ratio(appearance.line_height_ratio())
.with_style(Properties::default().weight(Weight::Semibold))
@@ -4825,7 +4825,7 @@ impl CodeReviewView {
)
.with_style(Properties::default().weight(Weight::Bold))
.with_color(
warp_core::ui::theme::Fill::Solid(internal_colors::neutral_6(theme)).into(),
galaxy_core::ui::theme::Fill::Solid(internal_colors::neutral_6(theme)).into(),
)
.finish(),
)
@@ -4880,7 +4880,7 @@ impl CodeReviewView {
axis_config,
appearance.theme().nonactive_ui_detail().into(),
appearance.theme().active_ui_detail().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.with_vertical_scrollbar(ScrollableAppearance::new(ScrollbarWidth::Auto, false))
.with_propagate_mousewheel_if_not_handled(true)
@@ -4939,7 +4939,7 @@ impl CodeReviewView {
.with_corner_radius(CornerRadius::with_all(Radius::Pixels(4.)));
if mouse_state.is_hovered() {
container = container.with_background(warp_core::ui::theme::Fill::Solid(
container = container.with_background(galaxy_core::ui::theme::Fill::Solid(
internal_colors::neutral_3(appearance.theme()),
))
}
@@ -4960,7 +4960,7 @@ impl CodeReviewView {
},
appearance.theme().nonactive_ui_detail().into(),
appearance.theme().active_ui_detail().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.with_vertical_scrollbar(ScrollableAppearance::new(ScrollbarWidth::Auto, false))
.finish();
@@ -5220,9 +5220,9 @@ impl CodeReviewView {
// We effectively make this an absolutely positioned header.
OffsetPositioning::offset_from_parent(
vec2f(0., scroll_offset_from_top.offset_from_start().as_f32()),
warpui::elements::ParentOffsetBounds::ParentByPosition,
warpui::elements::ParentAnchor::TopMiddle,
warpui::elements::ChildAnchor::TopMiddle,
galaxyui::elements::ParentOffsetBounds::ParentByPosition,
galaxyui::elements::ParentAnchor::TopMiddle,
galaxyui::elements::ChildAnchor::TopMiddle,
),
);
}
@@ -5491,7 +5491,7 @@ impl CodeReviewView {
Text::new("•", appearance.ui_font_family(), appearance.ui_font_size())
.with_style(Properties::default().weight(Weight::Bold))
.with_color(
warp_core::ui::theme::Fill::Solid(internal_colors::neutral_6(
galaxy_core::ui::theme::Fill::Solid(internal_colors::neutral_6(
appearance.theme(),
))
.into(),
@@ -5519,7 +5519,7 @@ impl CodeReviewView {
.with_horizontal_padding(8.)
.with_vertical_padding(4.)
.with_border(
Border::all(1.).with_border_fill(warp_core::ui::theme::Fill::Solid(
Border::all(1.).with_border_fill(galaxy_core::ui::theme::Fill::Solid(
internal_colors::neutral_4(appearance.theme()),
)),
)
@@ -5816,7 +5816,7 @@ impl CodeReviewView {
},
appearance.theme().nonactive_ui_detail().into(),
appearance.theme().active_ui_detail().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.with_vertical_scrollbar(ScrollableAppearance::new(ScrollbarWidth::Auto, false))
.finish();
@@ -6346,7 +6346,7 @@ impl CodeReviewView {
fn insert_diff_hunk_as_context(
&mut self,
file_path: PathBuf,
line_range: Range<warp_editor::render::model::LineCount>,
line_range: Range<galaxy_editor::render::model::LineCount>,
ctx: &mut ViewContext<Self>,
) {
let Some(repo_path) = self.repo_path() else {
@@ -6519,7 +6519,7 @@ impl CodeReviewView {
fn extract_diff_hunk_data(
&self,
file_path: &PathBuf,
line_range: &Range<warp_editor::render::model::LineCount>,
line_range: &Range<galaxy_editor::render::model::LineCount>,
) -> Option<(DiffHunk, u32, u32)> {
if let CodeReviewViewState::Loaded(state) = self.state() {
// Find the file state that matches the given file path
@@ -6648,7 +6648,7 @@ impl CodeReviewView {
fn restore_cursor_position(
editor: &CodeEditorView,
selections: Vec<SelectionOffsets>,
ctx: &mut warpui::ViewContext<CodeEditorView>,
ctx: &mut galaxyui::ViewContext<CodeEditorView>,
) {
if let Ok(selections_vec1) = Vec1::try_from_vec(selections) {
editor.model.update(ctx, |model, ctx| {
app/src/code_review/code_review_view_integration.rs
+3 -3
View File
@@ -1,10 +1,10 @@
use std::path::{Path, PathBuf};
use warp_editor::model::CoreEditorModel;
use warp_editor::render::model::{
use galaxy_editor::model::CoreEditorModel;
use galaxy_editor::render::model::{
BlockItem, HitTestOptions, LineCount, Location, RenderLineLocation,
};
use warpui::{units::Pixels, AppContext, ViewContext};
use galaxyui::{units::Pixels, AppContext, ViewContext};
use super::{CodeReviewView, CodeReviewViewState, FILE_HEADER_HEIGHT};
use crate::code::editor::line::EditorLineLocation;
app/src/code_review/code_review_view_tests.rs
+14 -14
View File
@@ -33,24 +33,24 @@ use lsp::LspManagerModel;
use repo_metadata::repositories::DetectedRepositories;
use std::path::PathBuf;
use std::sync::Arc;
use warp_core::features::FeatureFlag;
use warp_core::ui::appearance::Appearance;
use warp_editor::content::buffer::InitialBufferState;
use warp_editor::render::element::VerticalExpansionBehavior;
use warp_editor::render::model::LineCount;
use warpui::elements::{Empty, MouseStateHandle};
use warpui::platform::WindowStyle;
use warpui::{App, ViewHandle};
use galaxy_core::features::FeatureFlag;
use galaxy_core::ui::appearance::Appearance;
use galaxy_editor::content::buffer::InitialBufferState;
use galaxy_editor::render::element::VerticalExpansionBehavior;
use galaxy_editor::render::model::LineCount;
use galaxyui::elements::{Empty, MouseStateHandle};
use galaxyui::platform::WindowStyle;
use galaxyui::{App, ViewHandle};
#[derive(Default)]
struct TestView;
impl warpui::Entity for TestView {
impl galaxyui::Entity for TestView {
type Event = ();
}
impl warpui::View for TestView {
fn render(&self, _: &warpui::AppContext) -> Box<dyn warpui::Element> {
impl galaxyui::View for TestView {
fn render(&self, _: &galaxyui::AppContext) -> Box<dyn galaxyui::Element> {
Empty::new().finish()
}
@@ -59,7 +59,7 @@ impl warpui::View for TestView {
}
}
impl warpui::TypedActionView for TestView {
impl galaxyui::TypedActionView for TestView {
type Action = ();
}
@@ -244,7 +244,7 @@ use crate::view_components::action_button::{ActionButton, NakedTheme};
struct TestContext {
repo_path: PathBuf,
#[allow(dead_code)]
window_id: warpui::WindowId,
window_id: galaxyui::WindowId,
state: LoadedState,
code_review_view: ViewHandle<CodeReviewView>,
}
@@ -291,7 +291,7 @@ impl TestContext {
/// Must be called within an App context.
fn create_loaded_state_with_editors(
app: &mut App,
window_id: warpui::WindowId,
window_id: galaxyui::WindowId,
file_editors: Vec<(PathBuf, ViewHandle<LocalCodeEditorView>)>,
) -> LoadedState {
let file_states = file_editors
app/src/code_review/comment_list_view.rs
+12 -12
View File
@@ -26,16 +26,16 @@ use pathfinder_geometry::vector::vec2f;
use std::path::PathBuf;
use string_offset::CharOffset;
use vec1::vec1;
use warp_core::features::FeatureFlag;
use warp_core::ui::color::blend::Blend;
use warp_editor::model::CoreEditorModel;
use galaxy_core::features::FeatureFlag;
use galaxy_core::ui::color::blend::Blend;
use galaxy_editor::model::CoreEditorModel;
use warp_core::ui::theme::color::internal_colors::{
use galaxy_core::ui::theme::color::internal_colors::{
accent_overlay_2, accent_overlay_3, neutral_1, neutral_3, neutral_4, neutral_6, text_main,
text_sub,
};
use warp_core::ui::theme::Fill;
use warpui::{
use galaxy_core::ui::theme::Fill;
use galaxyui::{
clipboard::ClipboardContent,
elements::{
new_scrollable::{NewScrollable, ScrollableAppearance, SingleAxisConfig},
@@ -602,7 +602,7 @@ impl CommentListView {
},
theme.nonactive_ui_detail().into(),
theme.active_ui_detail().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.with_vertical_scrollbar(ScrollableAppearance::new(ScrollbarWidth::Auto, false))
.with_propagate_mousewheel_if_not_handled(true)
@@ -691,7 +691,7 @@ impl CommentListView {
};
let icon_element = icon
.to_warpui_icon(warp_core::ui::theme::Fill::Solid(text_sub(
.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(text_sub(
theme,
neutral_1(theme),
)))
@@ -773,7 +773,7 @@ impl CommentListView {
false, /* bottom */
true, /* right */
)
.with_border_fill(warp_core::ui::theme::Fill::Solid(neutral_4(theme))),
.with_border_fill(galaxy_core::ui::theme::Fill::Solid(neutral_4(theme))),
)
.finish()
}
@@ -835,7 +835,7 @@ impl CommentListView {
};
let icon_element = icon
.to_warpui_icon(warp_core::ui::theme::Fill::Solid(text_sub(
.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(text_sub(
theme,
neutral_3(theme),
)))
@@ -1154,8 +1154,8 @@ impl View for CommentListView {
Resizable::new(self.view_state.resizable_state.clone(), panel)
.with_dragbar_side(DragBarSide::Top)
.with_dragbar_color(warpui::elements::Fill::Solid(
warpui::color::ColorU::transparent_black(),
.with_dragbar_color(galaxyui::elements::Fill::Solid(
galaxyui::color::ColorU::transparent_black(),
))
.with_bounds_callback(Box::new(|window_size| (100.0, window_size.y() * 0.8)))
.on_resize(|ctx, _| {
app/src/code_review/comment_rendering.rs
+12 -12
View File
@@ -18,20 +18,20 @@ use crate::editor::InteractionState;
use crate::notebooks::editor::view::RichTextEditorView;
use crate::util::time_format::human_readable_approx_duration;
use pathfinder_color::ColorU;
use warp_core::ui::theme::color::internal_colors::{neutral_1, neutral_2, text_sub};
use warp_core::ui::theme::Fill;
use warp_editor::content::buffer::InitialBufferState;
use warp_editor::render::element::VerticalExpansionBehavior;
use warpui::elements::new_scrollable::ScrollableAppearance;
use warpui::elements::ScrollbarWidth;
use warpui::elements::{
use galaxy_core::ui::theme::color::internal_colors::{neutral_1, neutral_2, text_sub};
use galaxy_core::ui::theme::Fill;
use galaxy_editor::content::buffer::InitialBufferState;
use galaxy_editor::render::element::VerticalExpansionBehavior;
use galaxyui::elements::new_scrollable::ScrollableAppearance;
use galaxyui::elements::ScrollbarWidth;
use galaxyui::elements::{
Border, ChildView, Container, CornerRadius, CrossAxisAlignment, Flex, Hoverable,
MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius, Shrinkable, Text,
};
use warpui::platform::Cursor;
use warpui::text_layout::ClipConfig;
use warpui::units::Pixels;
use warpui::{AppContext, Element, EventContext, SingletonEntity, View, ViewContext, ViewHandle};
use galaxyui::platform::Cursor;
use galaxyui::text_layout::ClipConfig;
use galaxyui::units::Pixels;
use galaxyui::{AppContext, Element, EventContext, SingletonEntity, View, ViewContext, ViewHandle};
/// Configuration for making the comment header clickable.
pub(crate) struct HeaderClickHandler {
@@ -43,7 +43,7 @@ pub(crate) struct HeaderClickHandler {
/// (rounded corners, neutral background, outline border).
fn comment_card_container(
content: Box<dyn Element>,
theme: &warp_core::ui::theme::WarpTheme,
theme: &galaxy_core::ui::theme::WarpTheme,
) -> Box<dyn Element> {
Container::new(content)
.with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
app/src/code_review/comments/batch.rs
+3 -3
View File
@@ -3,9 +3,9 @@ use super::{
};
use crate::{code::editor::EditorReviewComment, code_review::diff_state::DiffMode};
use std::{collections::HashMap, path::Path};
use warp_core::features::FeatureFlag;
use warp_editor::render::model::LineCount;
use warpui::{Entity, ModelContext};
use galaxy_core::features::FeatureFlag;
use galaxy_editor::render::model::LineCount;
use galaxyui::{Entity, ModelContext};
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum ReviewCommentBatchEvent {
app/src/code_review/comments/batch_tests.rs
+2 -2
View File
@@ -1,6 +1,6 @@
use chrono::Local;
use warp_editor::render::model::LineCount;
use warpui::App;
use galaxy_editor::render::model::LineCount;
use galaxyui::App;
use crate::code::editor::line::EditorLineLocation;
use crate::code_review::comments::{
app/src/code_review/comments/comment.rs
+1 -1
View File
@@ -5,7 +5,7 @@ use crate::{
use chrono::{DateTime, Local};
use std::fmt::{Display, Formatter};
use std::path::PathBuf;
use warp_editor::render::model::LineCount;
use galaxy_editor::render::model::LineCount;
use warp_multi_agent_api::{self as api};
#[derive(Clone, Debug, Default, PartialEq, Eq)]
app/src/code_review/comments/diff_hunk_parser.rs
+1 -1
View File
@@ -2,7 +2,7 @@
use ai::agent::action::CommentSide;
use num_traits::SaturatingSub;
use warp_editor::render::model::LineCount;
use galaxy_editor::render::model::LineCount;
use crate::{
code::editor::line::EditorLineLocation,
app/src/code_review/context.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use crate::ai::agent::DiffSetHunk;
use crate::code_review::diff_state::{DiffLineType, FileDiff};
use std::collections::HashMap;
use warp_editor::render::model::LineCount;
use galaxy_editor::render::model::LineCount;
cfg_if::cfg_if! {
if #[cfg(feature = "local_fs")] {
@@ -9,7 +9,7 @@ cfg_if::cfg_if! {
use crate::ai::agent::{AIAgentAttachment, CurrentHead, DiffBase};
use crate::ai::blocklist::BlocklistAIContextModel;
use crate::code_review::{diff_state::DiffMode, DiffSetScope};
use warpui::{AppContext, ModelHandle};
use galaxyui::{AppContext, ModelHandle};
}
}
app/src/code_review/diff_menu.rs
+5 -5
View File
@@ -3,9 +3,9 @@
use std::cmp;
use fuzzy_match::{match_indices_case_insensitive, FuzzyMatchResult};
use warp_core::ui::theme::Fill;
use warp_editor::editor::NavigationKey;
use warpui::{
use galaxy_core::ui::theme::Fill;
use galaxy_editor::editor::NavigationKey;
use galaxyui::{
color::ColorU,
elements::{
Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Dismiss,
@@ -334,7 +334,7 @@ impl CodeReviewDiffMenu {
let check_slot: Box<dyn Element> = if target.is_selected {
ConstrainedBox::new(
Icon::Check.to_warpui_icon(Fill::Solid(text_color)).finish(),
Icon::Check.to_galaxyui_icon(Fill::Solid(text_color)).finish(),
)
.with_width(CHECK_SLOT_SIZE)
.with_height(CHECK_SLOT_SIZE)
@@ -415,7 +415,7 @@ impl CodeReviewDiffMenu {
ScrollbarWidth::None,
theme.nonactive_ui_detail().into(),
theme.active_ui_detail().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.with_padding_end(0.)
.with_padding_start(0.);
app/src/code_review/diff_selector.rs
+3 -3
View File
@@ -1,8 +1,8 @@
//! Trigger button + [`CodeReviewDiffMenu`] overlay for picking the diff
//! target in the code review header.
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::theme::Fill;
use warpui::{
use galaxy_core::ui::theme::Fill;
use galaxyui::{
elements::{
ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
Element, Flex, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement,
@@ -180,7 +180,7 @@ impl View for DiffSelector {
// for short labels.
let icon = ConstrainedBox::new(
Icon::SwitchHorizontal01
.to_warpui_icon(Fill::Solid(text_color))
.to_galaxyui_icon(Fill::Solid(text_color))
.finish(),
)
.with_width(15.)
app/src/code_review/diff_state.rs
+10 -10
View File
@@ -22,8 +22,8 @@ cfg_if::cfg_if! {
}
}
#[cfg(not(target_arch = "wasm32"))]
use warpui::AppContext;
use warpui::{r#async::SpawnedFutureHandle, ModelContext};
use galaxyui::AppContext;
use galaxyui::{r#async::SpawnedFutureHandle, ModelContext};
use crate::code_review::diff_size_limits::DiffSize;
use crate::features::FeatureFlag;
@@ -38,19 +38,19 @@ use super::diff_size_limits::compute_diff_size;
use crate::code_review::CodeReviewTelemetryEvent;
#[cfg(not(target_family = "wasm"))]
use warp_core::channel::ChannelState;
use warp_core::{safe_warn, send_telemetry_from_ctx};
use galaxy_core::channel::ChannelState;
use galaxy_core::{safe_warn, send_telemetry_from_ctx};
cfg_if::cfg_if! {
if #[cfg(feature = "local_fs")] {
use repo_metadata::repositories::{DetectedRepositories, RepoDetectionSource};
use warpui::SingletonEntity;
use galaxyui::SingletonEntity;
use repo_metadata::{
repository::{RepositorySubscriber, SubscriberId},
RepoMetadataError, Repository, RepositoryUpdate,
};
use async_channel::Sender;
use warpui::ModelHandle;
use galaxyui::ModelHandle;
}
}
#[cfg(all(feature = "local_fs", feature = "local_tty"))]
@@ -605,7 +605,7 @@ impl DiffStateModel {
}
#[cfg(not(feature = "local_fs"))]
pub fn is_git_operation_blocked(&self, _app: &warpui::AppContext) -> bool {
pub fn is_git_operation_blocked(&self, _app: &galaxyui::AppContext) -> bool {
false
}
/// Get comprehensive git diff information including uncommitted stats, main branch stats, and main branch name
@@ -658,7 +658,7 @@ impl DiffStateModel {
}
#[cfg(not(feature = "local_fs"))]
pub fn active_repository_path(&self, _app: &warpui::AppContext) -> Option<PathBuf> {
pub fn active_repository_path(&self, _app: &galaxyui::AppContext) -> Option<PathBuf> {
None
}
@@ -1586,7 +1586,7 @@ impl DiffStateModel {
let n = file.read(&mut buffer)?;
buffer.truncate(n);
if warp_util::file_type::is_buffer_binary(&buffer) {
if galaxy_util::file_type::is_buffer_binary(&buffer) {
return Ok(None);
}
file.rewind()?;
@@ -2967,7 +2967,7 @@ pub enum DiffStateModelEvent {
DiffModeChanged { should_fetch_base: bool },
}
impl warpui::Entity for DiffStateModel {
impl galaxyui::Entity for DiffStateModel {
type Event = DiffStateModelEvent;
}
app/src/code_review/editor_state.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use warpui::elements::MouseStateHandle;
use warpui::{AppContext, ViewHandle};
use galaxyui::elements::MouseStateHandle;
use galaxyui::{AppContext, ViewHandle};
use crate::code::local_code_editor::LocalCodeEditorView;
app/src/code_review/file_invalidation_queue.rs
+1 -1
View File
@@ -2,7 +2,7 @@ use std::future::Future;
use std::path::PathBuf;
use std::pin::Pin;
use warp_core::sync_queue::{IsTransientError, SyncQueueTaskTrait};
use galaxy_core::sync_queue::{IsTransientError, SyncQueueTaskTrait};
use super::diff_state::{DiffMode, DiffStateModel, FileDiffAndContent};
app/src/code_review/find_model.rs
+8 -8
View File
@@ -6,15 +6,15 @@ use std::collections::HashMap;
use std::ops::Range;
use string_offset::CharOffset;
#[cfg(not(target_family = "wasm"))]
use warp_core::channel::ChannelState;
use warp_core::send_telemetry_from_ctx;
use galaxy_core::channel::ChannelState;
use galaxy_core::send_telemetry_from_ctx;
#[cfg(not(target_family = "wasm"))]
use warp_editor::content::find::SearchConfig;
use galaxy_editor::content::find::SearchConfig;
#[cfg(not(target_family = "wasm"))]
use warp_editor::search::Searcher;
use warp_editor::search::{RestorableSearchResults, SelectedResult};
use warpui::WeakViewHandle;
use warpui::{
use galaxy_editor::search::Searcher;
use galaxy_editor::search::{RestorableSearchResults, SelectedResult};
use galaxyui::WeakViewHandle;
use galaxyui::{
r#async::SpawnedFutureHandle, AppContext, Entity, EntityId, ModelContext, ViewHandle,
};
@@ -222,7 +222,7 @@ impl CodeReviewFindModel {
&self,
editor_id: EntityId,
ctx: &AppContext,
) -> Option<warpui::ModelHandle<Searcher>> {
) -> Option<galaxyui::ModelHandle<Searcher>> {
let view = self.weak_view_handle.upgrade(ctx);
if view.is_none() {
if ChannelState::enable_debug_features() {
app/src/code_review/find_model_tests.rs
+10 -10
View File
@@ -20,22 +20,22 @@ use repo_metadata::repositories::DetectedRepositories;
use std::path::PathBuf;
use std::sync::Arc;
use string_offset::CharOffset;
use warp_core::ui::appearance::Appearance;
use warp_editor::content::buffer::InitialBufferState;
use warp_editor::render::element::VerticalExpansionBehavior;
use warpui::elements::Empty;
use warpui::platform::WindowStyle;
use warpui::{App, Element as _, ModelHandle, ViewHandle};
use galaxy_core::ui::appearance::Appearance;
use galaxy_editor::content::buffer::InitialBufferState;
use galaxy_editor::render::element::VerticalExpansionBehavior;
use galaxyui::elements::Empty;
use galaxyui::platform::WindowStyle;
use galaxyui::{App, Element as _, ModelHandle, ViewHandle};
#[derive(Default)]
struct TestView;
impl warpui::Entity for TestView {
impl galaxyui::Entity for TestView {
type Event = ();
}
impl warpui::View for TestView {
fn render(&self, _: &warpui::AppContext) -> Box<dyn warpui::Element> {
impl galaxyui::View for TestView {
fn render(&self, _: &galaxyui::AppContext) -> Box<dyn galaxyui::Element> {
Empty::new().finish()
}
@@ -44,7 +44,7 @@ impl warpui::View for TestView {
}
}
impl warpui::TypedActionView for TestView {
impl galaxyui::TypedActionView for TestView {
type Action = ();
}
app/src/code_review/git_dialog/commit.rs
+2 -2
View File
@@ -4,8 +4,8 @@
use std::path::Path;
use warp_core::ui::appearance::Appearance;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{
elements::{
ChildView, ClippedScrollStateHandle, Container, CornerRadius, CrossAxisAlignment, Element,
Flex, MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius, Text,
app/src/code_review/git_dialog/mod.rs
+5 -5
View File
@@ -12,9 +12,9 @@
use std::path::PathBuf;
use pathfinder_geometry::vector::vec2f;
use warp_core::features::FeatureFlag;
use warp_core::ui::appearance::Appearance;
use warpui::{
use galaxy_core::features::FeatureFlag;
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{
elements::{
Align, Border, ChildAnchor, ChildView, ClippedScrollStateHandle, ClippedScrollable,
ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Element, Flex, Hoverable,
@@ -68,7 +68,7 @@ pub fn init(ctx: &mut AppContext) {
ctx.register_fixed_bindings(vec![FixedBinding::new(
"escape",
GitDialogAction::Cancel,
warpui::id!("GitDialog"),
galaxyui::id!("GitDialog"),
)]);
}
@@ -370,7 +370,7 @@ fn render_file_changes_box(
ScrollbarWidth::Auto,
theme.nonactive_ui_detail().into(),
theme.active_ui_detail().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.finish(),
)
app/src/code_review/git_dialog/pr.rs
+2 -2
View File
@@ -4,8 +4,8 @@
//! with expandable per-file stats. On confirm, spawns `create_pr` and shows
//! a toast with a clickable "Open PR" link.
use warp_core::ui::appearance::Appearance;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{
elements::{
ClippedScrollStateHandle, Container, Element, Flex, MouseStateHandle, ParentElement, Text,
},
app/src/code_review/git_dialog/push.rs
+3 -3
View File
@@ -7,8 +7,8 @@
use std::collections::HashMap;
use warp_core::ui::appearance::Appearance;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{
elements::{
Border, ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox, Container,
CornerRadius, CrossAxisAlignment, Element, Flex, Hoverable, MainAxisAlignment,
@@ -356,7 +356,7 @@ fn render_commits_section(state: &PushState, appearance: &Appearance) -> Box<dyn
ScrollbarWidth::Auto,
theme.nonactive_ui_detail().into(),
theme.active_ui_detail().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.finish(),
)
app/src/code_review/git_status_update.rs
+3 -3
View File
@@ -1,9 +1,9 @@
use warpui::{Entity, SingletonEntity};
use galaxyui::{Entity, SingletonEntity};
#[cfg(feature = "local_fs")]
use std::path::{Path, PathBuf};
#[cfg(feature = "local_fs")]
use warpui::ModelContext;
use galaxyui::ModelContext;
#[cfg(feature = "local_fs")]
use {
@@ -16,7 +16,7 @@ use {
Repository, RepositoryUpdate,
},
std::{collections::HashMap, time::Duration},
warpui::{r#async::SpawnedFutureHandle, ModelHandle, WeakModelHandle},
galaxyui::{r#async::SpawnedFutureHandle, ModelHandle, WeakModelHandle},
};
#[cfg(feature = "local_fs")]
app/src/code_review/hidden_lines.rs
+2 -2
View File
@@ -2,8 +2,8 @@ use std::ops::Range;
use ai::diff_validation::DiffDelta;
use rangemap::RangeSet;
use warp_editor::content::text::LineCount;
use warp_editor::render::model::LineCount as RenderLineCount;
use galaxy_editor::content::text::LineCount;
use galaxy_editor::render::model::LineCount as RenderLineCount;
/// The number of context lines to show before and after each change
const CONTEXT_LINES: usize = 4;
app/src/code_review/mod.rs
+1 -1
View File
@@ -22,7 +22,7 @@ pub(crate) mod file_invalidation_queue;
use code_review_view::CodeReviewAction;
use std::path::{Path, PathBuf};
use warpui::{
use galaxyui::{
id,
keymap::{EditableBinding, FixedBinding},
AppContext, Entity, EntityId, ModelContext, SingletonEntity, WeakViewHandle, WindowId,
app/src/code_review/scroll_preservation.rs
+3 -3
View File
@@ -1,8 +1,8 @@
use warp_core::features::FeatureFlag;
use warpui::{elements::ScrollOffset, units::Pixels, ViewContext, ViewHandle};
use galaxy_core::features::FeatureFlag;
use galaxyui::{elements::ScrollOffset, units::Pixels, ViewContext, ViewHandle};
#[cfg(not(target_family = "wasm"))]
use warpui::{AppContext, WeakViewHandle};
use galaxyui::{AppContext, WeakViewHandle};
#[cfg(not(target_family = "wasm"))]
use super::FILE_HEADER_HEIGHT;
app/src/code_review/telemetry_event.rs
+3 -3
View File
@@ -6,7 +6,7 @@ use serde_json::json;
use serde_with::SerializeDisplay;
use std::fmt::Display;
use strum_macros::{EnumDiscriminants, EnumIter};
use warp_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
/// Entry points for opening the code review pane.
#[derive(Clone, Copy, Debug, SerializeDisplay, Default)]
@@ -320,7 +320,7 @@ impl TelemetryEvent for CodeReviewTelemetryEvent {
}
fn event_descs() -> impl Iterator<Item = Box<dyn TelemetryEventDesc>> {
warp_core::telemetry::enum_events::<Self>()
galaxy_core::telemetry::enum_events::<Self>()
}
}
@@ -399,4 +399,4 @@ impl TelemetryEventDesc for CodeReviewTelemetryEventDiscriminants {
}
}
warp_core::register_telemetry_event!(CodeReviewTelemetryEvent);
galaxy_core::register_telemetry_event!(CodeReviewTelemetryEvent);