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/file_tree/view.rs
+23 -23
View File
@@ -13,22 +13,22 @@ use std::collections::{HashMap, HashSet};
use std::ops::Range;
use std::path::{Path, PathBuf};
use std::sync::Arc;
use warp_util::path::LineAndColumnArg;
use warp_util::standardized_path::StandardizedPath;
use galaxy_util::path::LineAndColumnArg;
use galaxy_util::standardized_path::StandardizedPath;
use repo_metadata::repositories::DetectedRepositories;
use warp_core::send_telemetry_from_ctx;
use warpui::elements::{
use galaxy_core::send_telemetry_from_ctx;
use galaxyui::elements::{
AcceptedByDropTarget, Align, Clipped, ConstrainedBox, Container, Dismiss, Draggable,
DraggableState, Empty, FormattedTextElement, MainAxisAlignment, Percentage, Rect, SavePosition,
Scrollable, Shrinkable,
};
use warpui::fonts::Style;
use warpui::keymap::FixedBinding;
use warpui::platform::Cursor;
use warpui::text_layout::TextAlignment;
use warpui::{clipboard::ClipboardContent, id, ViewContext, WeakViewHandle};
use warpui::{
use galaxyui::fonts::Style;
use galaxyui::keymap::FixedBinding;
use galaxyui::platform::Cursor;
use galaxyui::text_layout::TextAlignment;
use galaxyui::{clipboard::ClipboardContent, id, ViewContext, WeakViewHandle};
use galaxyui::{
elements::{
ChildAnchor, ChildView, CrossAxisAlignment, Flex, Hoverable, MainAxisSize,
MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds,
@@ -39,7 +39,7 @@ use warpui::{
AppContext, Element, Entity, EventContext, SingletonEntity as _, TypedActionView, View,
ViewHandle,
};
use warpui::{BlurContext, ModelHandle};
use galaxyui::{BlurContext, ModelHandle};
use crate::code::active_file::{ActiveFileEvent, ActiveFileModel};
use crate::coding_panel_enablement_state::CodingPanelEnablementState;
@@ -64,10 +64,10 @@ use crate::{
view_components::DismissibleToast,
workspace::ToastStack,
};
use warp_core::features::FeatureFlag;
use warp_core::ui::theme::{color::internal_colors, Fill};
use warp_core::HostId;
use warpui::ui_components::components::UiComponent;
use galaxy_core::features::FeatureFlag;
use galaxy_core::ui::theme::{color::internal_colors, Fill};
use galaxy_core::HostId;
use galaxyui::ui_components::components::UiComponent;
mod editing;
mod render;
@@ -985,8 +985,8 @@ impl FileTreeView {
.collect();
// Ancestor-dedup only local inputs. Shared with `GlobalSearchView`
// via `warp_util::path::group_roots_by_common_ancestor`.
let grouping = warp_util::path::group_roots_by_common_ancestor(&local_inputs);
// via `galaxy_util::path::group_roots_by_common_ancestor`.
let grouping = galaxy_util::path::group_roots_by_common_ancestor(&local_inputs);
// Final displayed order: local surviving roots (in input order),
// followed by preserved remote roots (in their existing order).
@@ -1786,7 +1786,7 @@ impl FileTreeView {
let expand_icon = match expand_icon {
Some(icon) => {
let chevron_icon_color = item_highlight_state.text_and_icon_color(appearance);
icon.to_warpui_icon(chevron_icon_color.into()).finish()
icon.to_galaxyui_icon(chevron_icon_color.into()).finish()
}
None => Empty::new().finish(),
};
@@ -1805,7 +1805,7 @@ impl FileTreeView {
// Add the icon for the item.
let icon_color = item_highlight_state.text_and_icon_color(appearance);
let icon = match render_state.icon {
ImageOrIcon::Icon(icon) => icon.to_warpui_icon(icon_color.into()).finish(),
ImageOrIcon::Icon(icon) => icon.to_galaxyui_icon(icon_color.into()).finish(),
ImageOrIcon::Image(image) => image,
};
header_row.add_child(
@@ -2637,7 +2637,7 @@ impl FileTreeView {
ScrollbarWidth::Auto,
theme.nonactive_ui_detail().into(),
theme.active_ui_detail().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.with_overlayed_scrollbar()
.finish(),
@@ -2684,7 +2684,7 @@ impl FileTreeView {
Container::new(
ConstrainedBox::new(
Icon::AlertTriangle
.to_warpui_icon(Fill::Solid(internal_colors::neutral_6(theme)))
.to_galaxyui_icon(Fill::Solid(internal_colors::neutral_6(theme)))
.finish(),
)
.with_width(24.)
@@ -2749,7 +2749,7 @@ impl FileTreeView {
// Create loading icon
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();
@@ -2771,7 +2771,7 @@ impl FileTreeView {
header_row.add_child(loading_icon);
let folder_icon = Icon::Folder
.to_warpui_icon(warp_core::ui::theme::Fill::Solid(
.to_galaxyui_icon(galaxy_core::ui::theme::Fill::Solid(
internal_colors::neutral_6(theme),
))
.finish();
app/src/code/file_tree/view/editing.rs
+3 -3
View File
@@ -8,8 +8,8 @@ use repo_metadata::file_tree_store::FileTreeEntryState;
use repo_metadata::{FileMetadata, FileTreeEntry};
use std::cmp::Ordering;
use std::sync::Arc;
use warp_util::standardized_path::StandardizedPath;
use warpui::{elements::MouseStateHandle, ViewContext};
use galaxy_util::standardized_path::StandardizedPath;
use galaxyui::{elements::MouseStateHandle, ViewContext};
use super::{FileTreeIdentifier, FileTreeItem, FileTreeView};
use crate::{
@@ -108,7 +108,7 @@ impl FileTreeView {
metadata: FileMetadata::from_standardized(path.join("new_file"), false).into(),
depth: depth + 1,
mouse_state_handle: MouseStateHandle::default(),
draggable_state: warpui::elements::DraggableState::default(),
draggable_state: galaxyui::elements::DraggableState::default(),
},
);
app/src/code/file_tree/view/editing_tests.rs
+1 -1
View File
@@ -2,7 +2,7 @@ use std::sync::Arc;
use repo_metadata::file_tree_store::{FileTreeDirectoryEntryState, FileTreeEntryState};
use repo_metadata::{FileMetadata, FileTreeEntry};
use warp_util::standardized_path::StandardizedPath;
use galaxy_util::standardized_path::StandardizedPath;
use super::sort_entries_for_file_tree;
app/src/code/file_tree/view/render.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::elements::{DraggableState, MouseStateHandle};
use galaxyui::elements::{DraggableState, MouseStateHandle};
use super::FileTreeItem;
use crate::code::icon_from_file_path;
app/src/code/file_tree/view/view_tests.rs
+37 -37
View File
@@ -7,8 +7,8 @@ use repo_metadata::repositories::DetectedRepositories;
use repo_metadata::watcher::DirectoryWatcher;
use repo_metadata::RepoMetadataModel;
use virtual_fs::{Stub, VirtualFS};
use warp_core::ui::appearance::Appearance;
use warpui::{platform::WindowStyle, App, ModelHandle};
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{platform::WindowStyle, App, ModelHandle};
use crate::auth::AuthStateProvider;
use crate::server::server_api::{team::MockTeamClient, workspace::MockWorkspaceClient};
@@ -21,8 +21,8 @@ use crate::workspaces::user_workspaces::UserWorkspaces;
use super::FileTreeView;
fn std_path(path: &std::path::Path) -> warp_util::standardized_path::StandardizedPath {
warp_util::standardized_path::StandardizedPath::try_from_local(path).unwrap()
fn std_path(path: &std::path::Path) -> galaxy_util::standardized_path::StandardizedPath {
galaxy_util::standardized_path::StandardizedPath::try_from_local(path).unwrap()
}
fn initialize_app(
@@ -58,7 +58,7 @@ fn build_repo_state(repo_root: &std::path::Path) -> FileTreeState {
false,
));
let src_dir = Entry::Directory(DirectoryEntry {
path: warp_util::standardized_path::StandardizedPath::try_from_local(
path: galaxy_util::standardized_path::StandardizedPath::try_from_local(
&repo_root.join("packages/app/src"),
)
.unwrap(),
@@ -67,7 +67,7 @@ fn build_repo_state(repo_root: &std::path::Path) -> FileTreeState {
loaded: true,
});
let app_dir = Entry::Directory(DirectoryEntry {
path: warp_util::standardized_path::StandardizedPath::try_from_local(
path: galaxy_util::standardized_path::StandardizedPath::try_from_local(
&repo_root.join("packages/app"),
)
.unwrap(),
@@ -76,7 +76,7 @@ fn build_repo_state(repo_root: &std::path::Path) -> FileTreeState {
loaded: true,
});
let packages_dir = Entry::Directory(DirectoryEntry {
path: warp_util::standardized_path::StandardizedPath::try_from_local(
path: galaxy_util::standardized_path::StandardizedPath::try_from_local(
&repo_root.join("packages"),
)
.unwrap(),
@@ -95,7 +95,7 @@ fn build_repo_state(repo_root: &std::path::Path) -> FileTreeState {
fn build_repo_state_with_unloaded_directory(repo_root: &std::path::Path) -> FileTreeState {
let unloaded_src_dir = Entry::Directory(DirectoryEntry {
path: warp_util::standardized_path::StandardizedPath::try_from_local(
path: galaxy_util::standardized_path::StandardizedPath::try_from_local(
&repo_root.join("src"),
)
.unwrap(),
@@ -126,7 +126,7 @@ fn repo_transition_unregisters_lazy_loaded_path() {
let repo_root = dirs.tests().join("repo");
let displayed_root = repo_root.join("packages/app");
let canonical_repo_root =
warp_util::standardized_path::StandardizedPath::from_local_canonicalized(&repo_root)
galaxy_util::standardized_path::StandardizedPath::from_local_canonicalized(&repo_root)
.unwrap();
App::test((), |mut app| async move {
@@ -145,13 +145,13 @@ fn repo_transition_unregisters_lazy_loaded_path() {
file_tree_view.read(&app, |view, _ctx| {
assert!(view.registered_lazy_loaded_paths.contains(
&warp_util::standardized_path::StandardizedPath::try_from_local(
&galaxy_util::standardized_path::StandardizedPath::try_from_local(
&displayed_root
)
.unwrap()
));
let displayed_std =
warp_util::standardized_path::StandardizedPath::try_from_local(&displayed_root)
galaxy_util::standardized_path::StandardizedPath::try_from_local(&displayed_root)
.unwrap();
assert_eq!(
view.root_directories
@@ -162,7 +162,7 @@ fn repo_transition_unregisters_lazy_loaded_path() {
});
repository_metadata_model.read(&app, |model, ctx| {
assert!(model.is_lazy_loaded_path(
&warp_util::standardized_path::StandardizedPath::try_from_local(
&galaxy_util::standardized_path::StandardizedPath::try_from_local(
&displayed_root
)
.unwrap(),
@@ -180,10 +180,10 @@ fn repo_transition_unregisters_lazy_loaded_path() {
file_tree_view.read(&app, |view, _ctx| {
let displayed_std =
warp_util::standardized_path::StandardizedPath::try_from_local(&displayed_root)
galaxy_util::standardized_path::StandardizedPath::try_from_local(&displayed_root)
.unwrap();
let repo_std =
warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap();
assert!(!view.registered_lazy_loaded_paths.contains(&displayed_std));
assert_eq!(view.root_for_path(&displayed_std), Some(repo_std.clone()));
@@ -196,7 +196,7 @@ fn repo_transition_unregisters_lazy_loaded_path() {
});
repository_metadata_model.read(&app, |model, ctx| {
assert!(!model.is_lazy_loaded_path(
&warp_util::standardized_path::StandardizedPath::try_from_local(
&galaxy_util::standardized_path::StandardizedPath::try_from_local(
&displayed_root
)
.unwrap(),
@@ -231,7 +231,7 @@ fn repo_backed_unloaded_directory_loads_through_model() {
let nested_dir = repo_root.join("src/nested");
let source_file = repo_root.join("src/nested/main.rs");
let canonical_repo_root =
warp_util::standardized_path::StandardizedPath::from_local_canonicalized(&repo_root)
galaxy_util::standardized_path::StandardizedPath::from_local_canonicalized(&repo_root)
.unwrap();
App::test((), |mut app| async move {
@@ -259,11 +259,11 @@ fn repo_backed_unloaded_directory_loads_through_model() {
assert!(!view
.root_directories
.get(
&warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
&galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap()
)
.is_some_and(|root_dir| root_dir.entry.contains(
&warp_util::standardized_path::StandardizedPath::try_from_local(
&galaxy_util::standardized_path::StandardizedPath::try_from_local(
&source_file
)
.unwrap()
@@ -272,9 +272,9 @@ fn repo_backed_unloaded_directory_loads_through_model() {
file_tree_view.update(&mut app, |view, ctx| {
view.ensure_loaded_path(
&warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
&galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap(),
&warp_util::standardized_path::StandardizedPath::try_from_local(&src_dir)
&galaxy_util::standardized_path::StandardizedPath::try_from_local(&src_dir)
.unwrap(),
ctx,
);
@@ -284,11 +284,11 @@ fn repo_backed_unloaded_directory_loads_through_model() {
assert!(view
.root_directories
.get(
&warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
&galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap()
)
.is_some_and(|root_dir| root_dir.entry.contains(
&warp_util::standardized_path::StandardizedPath::try_from_local(
&galaxy_util::standardized_path::StandardizedPath::try_from_local(
&nested_dir
)
.unwrap()
@@ -297,9 +297,9 @@ fn repo_backed_unloaded_directory_loads_through_model() {
file_tree_view.update(&mut app, |view, ctx| {
view.ensure_loaded_path(
&warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
&galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap(),
&warp_util::standardized_path::StandardizedPath::try_from_local(&nested_dir)
&galaxy_util::standardized_path::StandardizedPath::try_from_local(&nested_dir)
.unwrap(),
ctx,
);
@@ -309,11 +309,11 @@ fn repo_backed_unloaded_directory_loads_through_model() {
assert!(view
.root_directories
.get(
&warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
&galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap()
)
.is_some_and(|root_dir| root_dir.entry.contains(
&warp_util::standardized_path::StandardizedPath::try_from_local(
&galaxy_util::standardized_path::StandardizedPath::try_from_local(
&source_file
)
.unwrap()
@@ -321,17 +321,17 @@ fn repo_backed_unloaded_directory_loads_through_model() {
});
repository_metadata_model.read(&app, |model, ctx| {
assert!(!model.is_lazy_loaded_path(
&warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
&galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap(),
ctx
));
let id = repo_metadata::RepositoryIdentifier::local(
warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap(),
);
assert!(model.get_repository(&id, ctx).is_some_and(|state| {
state.entry.contains(
&warp_util::standardized_path::StandardizedPath::try_from_local(
&galaxy_util::standardized_path::StandardizedPath::try_from_local(
&source_file,
)
.unwrap(),
@@ -352,7 +352,7 @@ fn pending_repository_root_does_not_register_lazy_loaded_path() {
let repo_root = dirs.tests().join("repo");
let canonical_repo_root =
warp_util::standardized_path::StandardizedPath::from_local_canonicalized(&repo_root)
galaxy_util::standardized_path::StandardizedPath::from_local_canonicalized(&repo_root)
.unwrap();
App::test((), |mut app| async move {
@@ -374,7 +374,7 @@ fn pending_repository_root_does_not_register_lazy_loaded_path() {
});
repository_metadata_model.read(&app, |model, ctx| {
let id = repo_metadata::RepositoryIdentifier::local(
warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap(),
);
assert!(matches!(
@@ -390,18 +390,18 @@ fn pending_repository_root_does_not_register_lazy_loaded_path() {
file_tree_view.read(&app, |view, _ctx| {
assert!(!view.registered_lazy_loaded_paths.contains(
&warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
&galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap()
));
});
repository_metadata_model.read(&app, |model, ctx| {
assert!(!model.is_lazy_loaded_path(
&warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
&galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap(),
ctx
));
let id = repo_metadata::RepositoryIdentifier::local(
warp_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
galaxy_util::standardized_path::StandardizedPath::try_from_local(&repo_root)
.unwrap(),
);
assert!(matches!(
@@ -430,7 +430,7 @@ fn failed_lazy_loaded_path_registration_is_retried() {
file_tree_view.read(&app, |view, _ctx| {
assert!(!view.registered_lazy_loaded_paths.contains(
&warp_util::standardized_path::StandardizedPath::try_from_local(
&galaxy_util::standardized_path::StandardizedPath::try_from_local(
&displayed_root
)
.unwrap()
@@ -438,7 +438,7 @@ fn failed_lazy_loaded_path_registration_is_retried() {
});
repository_metadata_model.read(&app, |model, ctx| {
assert!(!model.is_lazy_loaded_path(
&warp_util::standardized_path::StandardizedPath::try_from_local(
&galaxy_util::standardized_path::StandardizedPath::try_from_local(
&displayed_root
)
.unwrap(),
@@ -463,7 +463,7 @@ fn failed_lazy_loaded_path_registration_is_retried() {
});
repository_metadata_model.read(&app, |model, ctx| {
assert!(model.is_lazy_loaded_path(
&warp_util::standardized_path::StandardizedPath::try_from_local(
&galaxy_util::standardized_path::StandardizedPath::try_from_local(
&displayed_root
)
.unwrap(),