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/active_file.rs
+1 -1
View File
@@ -3,7 +3,7 @@
use std::path::PathBuf;
use warpui::{Entity, ModelContext};
use galaxyui::{Entity, ModelContext};
/// Events emitted by the ActiveFileModel.
#[derive(Debug, Clone)]
app/src/code/diff_viewer.rs
+4 -4
View File
@@ -1,10 +1,10 @@
use std::ops::Range;
use ai::diff_validation::DiffType;
use warp_editor::render::element::VerticalExpansionBehavior;
use warpui::elements::new_scrollable::ScrollableAppearance;
use warpui::elements::ScrollbarWidth;
use warpui::{AppContext, View, ViewContext, ViewHandle};
use galaxy_editor::render::element::VerticalExpansionBehavior;
use galaxyui::elements::new_scrollable::ScrollableAppearance;
use galaxyui::elements::ScrollbarWidth;
use galaxyui::{AppContext, View, ViewContext, ViewHandle};
use super::editor::scroll::ScrollWheelBehavior;
use super::editor::view::CodeEditorView;
app/src/code/editor/comment_editor.rs
+4 -4
View File
@@ -17,9 +17,9 @@ use crate::view_components::action_button::{
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::Vector2F;
use std::cell::RefCell;
use warp_core::ui::{appearance::Appearance, theme::Fill};
use warp_editor::render::element::VerticalExpansionBehavior;
use warpui::{
use galaxy_core::ui::{appearance::Appearance, theme::Fill};
use galaxy_editor::render::element::VerticalExpansionBehavior;
use galaxyui::{
elements::{
Border, ChildView, Clipped, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
Flex, MainAxisAlignment, MainAxisSize, ParentElement, Radius, Shrinkable, Text,
@@ -326,7 +326,7 @@ impl CommentEditor {
let theme = appearance.theme();
let sub_text_color = theme.sub_text_color(Fill::Solid(background)).into_solid();
let icon = Icon::Github
.to_warpui_icon(Fill::Solid(sub_text_color))
.to_galaxyui_icon(Fill::Solid(sub_text_color))
.finish();
let label = Text::new(
app/src/code/editor/comment_editor_tests.rs
+2 -2
View File
@@ -1,6 +1,6 @@
use std::sync::Arc;
use warpui::{
use galaxyui::{
platform::WindowStyle, presenter::ChildView, App, Element, Entity, TypedActionView, View,
ViewHandle, WindowId,
};
@@ -45,7 +45,7 @@ impl View for TestView {
"CommentEditorTestView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn warpui::Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn galaxyui::Element> {
ChildView::new(&self.editor).finish()
}
}
app/src/code/editor/comments.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use chrono::{DateTime, Local};
use warpui::{Entity, ModelContext};
use galaxyui::{Entity, ModelContext};
use crate::code::editor::line::EditorLineLocation;
use crate::code_review::comments::{
app/src/code/editor/diff.rs
+4 -4
View File
@@ -9,13 +9,13 @@ use pathfinder_color::ColorU;
use rangemap::RangeMap;
use similar::{ChangeTag, DiffOp, TextDiff};
use string_offset::CharOffset;
use warp_core::ui::theme::Fill;
use warp_editor::{
use galaxy_core::ui::theme::Fill;
use galaxy_editor::{
content::{edit::TemporaryBlock, version::BufferVersion},
multiline::{AnyMultilineString, MultilineStr, MultilineString, LF},
render::model::{Decoration, LineCount, LineDecoration},
};
use warpui::{Entity, ModelContext};
use galaxyui::{Entity, ModelContext};
use super::super::DiffResult;
@@ -23,7 +23,7 @@ use crate::{
appearance::Appearance,
code::editor::{line::EditorLineLocation, line_iterator::LineIterator},
};
use warp_core::ui::theme::AnsiColorIdentifier;
use galaxy_core::ui::theme::AnsiColorIdentifier;
const OVERLAY_ALPHA: u8 = 56;
const INLINE_OVERLAY_ALPHA: u8 = 71;
app/src/code/editor/diff_tests.rs
+9 -9
View File
@@ -2,7 +2,7 @@ use std::collections::HashMap;
use rangemap::RangeMap;
use unindent::Unindent as _;
use warp_editor::multiline::{MultilineStr, MultilineString};
use galaxy_editor::multiline::{MultilineStr, MultilineString};
use crate::code::editor::diff::ChangeType;
@@ -10,7 +10,7 @@ use super::DiffModel;
#[test]
fn test_diff_generation() {
use warpui::App;
use galaxyui::App;
App::test((), |_| async move {
let (change_mapping, deletion_mapping) = DiffModel::compute_diff_internal(
MultilineStr::try_new("Hello World\nThis is the second line.\nThis is the third.")
@@ -76,7 +76,7 @@ fn test_diff_generation() {
#[test]
fn test_reverse_action() {
use warpui::App;
use galaxyui::App;
App::test((), |_| async move {
let mut diff_model = DiffModel::new();
diff_model.set_base(MultilineString::apply(
@@ -109,7 +109,7 @@ fn test_reverse_action() {
#[test]
fn test_reverse_action_replaced_newlines() {
use warpui::App;
use galaxyui::App;
App::test((), |_| async move {
let mut diff_model = DiffModel::new();
let base_text = r"
@@ -192,7 +192,7 @@ fn test_reverse_action_replaced_newlines() {
#[test]
fn test_reverse_action_replaced_text() {
use warpui::App;
use galaxyui::App;
App::test((), |_| async move {
let mut diff_model = DiffModel::new();
let base_text = r"
@@ -269,7 +269,7 @@ fn test_reverse_action_replaced_text() {
#[test]
fn test_reverse_action_deleted_lines() {
use warpui::App;
use galaxyui::App;
App::test((), |_| async move {
let mut diff_model = DiffModel::new();
let base_text = r"
@@ -353,7 +353,7 @@ fn test_reverse_action_deleted_lines() {
#[test]
fn test_diff_count_before_line() {
use warpui::App;
use galaxyui::App;
App::test((), |_| async move {
let mut diff_model = DiffModel::new();
diff_model.set_base(
@@ -373,7 +373,7 @@ fn test_diff_count_before_line() {
#[test]
fn test_unified_diff() {
use warpui::App;
use galaxyui::App;
App::test((), |_| async move {
let diff = DiffModel::retrieve_unified_diff_internal(
MultilineStr::try_new("Hello World\nThis is the second line.\nThis is the third.")
@@ -395,7 +395,7 @@ fn test_unified_diff() {
/// to produce duplicate deletion and insertion hunks for what is logically a replacement.
#[test]
fn test_coalesce_replacements() {
use warpui::App;
use galaxyui::App;
App::test((), |_| async move {
let mut diff_model = DiffModel::new();
let base_text = r"
app/src/code/editor/element.rs
+8 -8
View File
@@ -15,11 +15,11 @@ use pathfinder_geometry::{
rect::RectF,
vector::{vec2f, Vector2F},
};
use warp_core::ui::{
use galaxy_core::ui::{
appearance::Appearance,
theme::{color::internal_colors, Fill},
};
use warp_editor::{
use galaxy_editor::{
editor::EditorView,
render::{
element::{
@@ -31,7 +31,7 @@ use warp_editor::{
},
},
};
use warpui::{
use galaxyui::{
elements::{
new_scrollable::{NewScrollableElement, ScrollableAxis},
Align, Axis, Border, ChildAnchor, ConstrainedBox, Container, CornerRadius, Empty, F32Ext,
@@ -56,8 +56,8 @@ use crate::{
},
view_components::action_button::{ActionButtonTheme, SecondaryTheme},
};
use warp_core::features::FeatureFlag;
use warpui::elements::{Hoverable, MouseStateHandle};
use galaxy_core::features::FeatureFlag;
use galaxyui::elements::{Hoverable, MouseStateHandle};
pub const GUTTER_WIDTH: f32 = 94.;
const VERTICAL_DIFF_HUNK_INDICATOR_WIDTH: f32 = 3.;
@@ -915,7 +915,7 @@ impl<V: EditorView> EditorWrapper<V> {
};
let icon = ConstrainedBox::new(
warpui::elements::Icon::new(
galaxyui::elements::Icon::new(
expansion_type.icon().into(),
line_number_config.text_color,
)
@@ -971,7 +971,7 @@ impl<V: EditorView> EditorWrapper<V> {
let container = Container::new(
ConstrainedBox::new(
warpui::elements::Icon::new(gutter_button.icon().into(), icon_color).finish(),
galaxyui::elements::Icon::new(gutter_button.icon().into(), icon_color).finish(),
)
.with_width(icon_size)
.with_height(icon_size)
@@ -1011,7 +1011,7 @@ impl<V: EditorView> EditorWrapper<V> {
});
if enabled {
button = button.with_cursor(warpui::platform::Cursor::PointingHand);
button = button.with_cursor(galaxyui::platform::Cursor::PointingHand);
if let Some(on_click_action) = on_click_action {
let action = on_click_action.clone();
app/src/code/editor/element/gutter_button.rs
+7 -7
View File
@@ -1,13 +1,13 @@
use crate::view_components::action_button::{
ActionButtonTheme, DisabledSecondaryTheme, SecondaryTheme,
};
use warp_core::ui::appearance::Appearance;
use warp_core::ui::color::contrast::MinimumAllowedContrast;
use warp_core::ui::color::ContrastingColor;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::Fill;
use warp_core::ui::Icon;
use warpui::elements::MouseState;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::color::contrast::MinimumAllowedContrast;
use galaxy_core::ui::color::ContrastingColor;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::Fill;
use galaxy_core::ui::Icon;
use galaxyui::elements::MouseState;
/// A button rendered within the gutter of the editor.
pub(super) trait GutterButton {
app/src/code/editor/embedded_comment.rs
+8 -8
View File
@@ -6,18 +6,18 @@ use std::sync::Arc;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use serde_yaml::Mapping;
use uuid::Uuid;
use warp_editor::content::markdown::MarkdownStyle;
use warp_editor::editor::EmbeddedItemModel;
use warp_editor::render::element::{RenderContext, RenderableBlock};
use warp_editor::render::layout::TextLayout;
use galaxy_editor::content::markdown::MarkdownStyle;
use galaxy_editor::editor::EmbeddedItemModel;
use galaxy_editor::render::element::{RenderContext, RenderableBlock};
use galaxy_editor::render::layout::TextLayout;
use warp_editor::render::model::{
use galaxy_editor::render::model::{
viewport::ViewportItem, BlockSpacing, EmbeddedItem, EmbeddedItemHTMLRepresentation,
EmbeddedItemRichFormat, LaidOutEmbeddedItem, RenderState,
};
use warpui::event::DispatchedEvent;
use warpui::units::Pixels;
use warpui::{AppContext, EntityId, EventContext, LayoutContext, ViewHandle, WindowId};
use galaxyui::event::DispatchedEvent;
use galaxyui::units::Pixels;
use galaxyui::{AppContext, EntityId, EventContext, LayoutContext, ViewHandle, WindowId};
use crate::code::editor::comment_editor::CommentEditor;
use crate::code_review::comments::CommentId;
app/src/code/editor/embedded_comment_tests.rs
+2 -2
View File
@@ -4,8 +4,8 @@ use super::{
};
use crate::code_review::comments::CommentId;
use serde_yaml::{Mapping, Value};
use warp_editor::content::markdown::MarkdownStyle;
use warpui::{EntityId, WindowId};
use galaxy_editor::content::markdown::MarkdownStyle;
use galaxyui::{EntityId, WindowId};
#[test]
fn test_comment_embedded_item_conversion_valid_input() {
app/src/code/editor/find/view.rs
+16 -16
View File
@@ -14,19 +14,19 @@ use crate::view_components::action_button::{ActionButton, DisabledSecondaryTheme
use crate::view_components::find::FindDirection;
use crate::{features::FeatureFlag, settings::AppEditorSettings};
use pathfinder_color::ColorU;
use warp_editor::editor::NavigationKey;
use warp_editor::search::{SearchEvent, Searcher};
use warpui::elements::MainAxisAlignment;
use warpui::elements::{ChildAnchor, OffsetPositioning, Radius, SavePosition, Shrinkable};
use warpui::keymap::EditableBinding;
use warpui::ui_components::components::UiComponent;
pub use warpui::{
use galaxy_editor::editor::NavigationKey;
use galaxy_editor::search::{SearchEvent, Searcher};
use galaxyui::elements::MainAxisAlignment;
use galaxyui::elements::{ChildAnchor, OffsetPositioning, Radius, SavePosition, Shrinkable};
use galaxyui::keymap::EditableBinding;
use galaxyui::ui_components::components::UiComponent;
pub use galaxyui::{
accessibility::{AccessibilityContent, WarpA11yRole},
elements::{ParentElement as _, Stack},
geometry::vector::vec2f,
AppContext,
};
use warpui::{
use galaxyui::{
elements::{
Align, Border, Clipped, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
DropShadow, Element, Flex, Hoverable, MouseStateHandle, ParentAnchor, ParentOffsetBounds,
@@ -34,8 +34,8 @@ use warpui::{
},
Entity, SingletonEntity, TypedActionView, View,
};
use warpui::{presenter::ChildView, ViewContext, ViewHandle};
use warpui::{FocusContext, ModelHandle};
use galaxyui::{presenter::ChildView, ViewContext, ViewHandle};
use galaxyui::{FocusContext, ModelHandle};
pub const FIND_BAR_WIDTH: f32 = 500.;
const ICON_PADDING: f32 = 4.;
@@ -104,7 +104,7 @@ pub enum FindAction {
}
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_editable_bindings([
EditableBinding::new(
"find:find_next_occurrence",
@@ -490,7 +490,7 @@ impl CodeEditorFind {
};
let icon = Container::new(
ConstrainedBox::new(
icon.to_warpui_icon(appearance.theme().active_ui_text_color())
icon.to_galaxyui_icon(appearance.theme().active_ui_text_color())
.finish(),
)
.with_height(size)
@@ -554,7 +554,7 @@ impl CodeEditorFind {
appearance.theme().active_ui_text_color()
};
Container::new(
ConstrainedBox::new(match_icon.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(match_icon.to_galaxyui_icon(icon_color).finish())
.with_height(height)
.with_width(height)
.finish(),
@@ -581,7 +581,7 @@ impl CodeEditorFind {
appearance.theme().active_ui_text_color()
};
Container::new(
ConstrainedBox::new(Icon::Search.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(Icon::Search.to_galaxyui_icon(icon_color).finish())
.with_height(height)
.with_width(height)
.finish(),
@@ -608,7 +608,7 @@ impl CodeEditorFind {
};
Container::new(
ConstrainedBox::new(
icon.to_warpui_icon(appearance.theme().active_ui_text_color())
icon.to_galaxyui_icon(appearance.theme().active_ui_text_color())
.finish(),
)
.with_height(height)
@@ -964,7 +964,7 @@ impl View for CodeEditorFind {
}
}
fn on_blur(&mut self, _blur_ctx: &warpui::BlurContext, ctx: &mut ViewContext<Self>) {
fn on_blur(&mut self, _blur_ctx: &galaxyui::BlurContext, ctx: &mut ViewContext<Self>) {
// Check if the currently focused view is one of our child components
let focused_view_id = ctx.focused_view_id(ctx.window_id());
let is_focus_within_find_bar = [
app/src/code/editor/goto_line/view.rs
+1 -1
View File
@@ -6,7 +6,7 @@ use crate::editor::{
EditorView, Event as EditorEvent, InteractionState, PropagateAndNoOpNavigationKeys,
SingleLineEditorOptions, TextOptions,
};
use warpui::{
use galaxyui::{
elements::{
Align, Border, ChildView, ConstrainedBox, Container, CornerRadius, DropShadow, Flex,
ParentElement, Radius, Text,
app/src/code/editor/line.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use std::ops::Range;
use warp_editor::render::model::{LineCount, RenderLineLocation};
use galaxy_editor::render::model::{LineCount, RenderLineLocation};
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum EditorLineLocation {
app/src/code/editor/model.rs
+31 -31
View File
@@ -11,18 +11,18 @@ use std::path::Path;
use std::rc::Rc;
use std::sync::Arc;
use std::{cmp, mem};
use warp_core::platform::SessionPlatform;
use warp_core::send_telemetry_from_ctx;
use warp_core::ui::theme::Fill;
use warp_editor::content::anchor::Anchor;
use warp_editor::content::edit::EditDelta;
use warp_editor::content::find::{SearchConfig, SearchResults};
use warp_editor::content::selection_model::BufferSelectionModel;
use warp_editor::content::version::BufferVersion;
use warp_editor::multiline::{AnyMultilineString, MultilineString, LF};
use warp_editor::render::model::{AutoScrollMode, LineCount, StyleUpdateAction};
use warp_editor::selection::TextDirection;
use warpui::units::{IntoPixels, Pixels};
use galaxy_core::platform::SessionPlatform;
use galaxy_core::send_telemetry_from_ctx;
use galaxy_core::ui::theme::Fill;
use galaxy_editor::content::anchor::Anchor;
use galaxy_editor::content::edit::EditDelta;
use galaxy_editor::content::find::{SearchConfig, SearchResults};
use galaxy_editor::content::selection_model::BufferSelectionModel;
use galaxy_editor::content::version::BufferVersion;
use galaxy_editor::multiline::{AnyMultilineString, MultilineString, LF};
use galaxy_editor::render::model::{AutoScrollMode, LineCount, StyleUpdateAction};
use galaxy_editor::selection::TextDirection;
use galaxyui::units::{IntoPixels, Pixels};
use crate::util::link_detection::get_word_range_at_offset;
use crate::{
@@ -47,9 +47,9 @@ use vim::{
vim_a_quote, vim_a_word, vim_find_char_on_line, vim_find_matching_bracket, vim_inner_block,
vim_inner_paragraph, vim_inner_quote, vim_inner_word, vim_word_iterator_from_offset,
};
use warp_core::semantic_selection::SemanticSelection;
use warp_editor::content::buffer::{ShouldAutoscroll, VimInsertPoint};
use warp_editor::{
use galaxy_core::semantic_selection::SemanticSelection;
use galaxy_editor::content::buffer::{ShouldAutoscroll, VimInsertPoint};
use galaxy_editor::{
content::{
buffer::{
AutoScrollBehavior, Buffer, BufferEditAction, BufferEvent, BufferSelectAction,
@@ -67,12 +67,12 @@ use warp_editor::{
},
selection::{SelectionMode, SelectionModel, TextUnit},
};
use warpui::elements::{
use galaxyui::elements::{
AnchorPair, OffsetPositioning, OffsetType, PositionedElementOffsetBounds, PositioningAxis,
XAxisAnchor, YAxisAnchor,
};
use warpui::text::{point::Point, TextBuffer};
use warpui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
use galaxyui::text::{point::Point, TextBuffer};
use galaxyui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
use super::super::DiffResult;
use super::comments::{EditorCommentsModel, PendingComment, PendingCommentEvent};
@@ -558,7 +558,7 @@ impl CodeEditorModel {
// Set the following line ranges to be hidden in the editor.
pub fn set_hidden_lines(
&mut self,
ranges: RangeSet<warp_editor::content::text::LineCount>,
ranges: RangeSet<galaxy_editor::content::text::LineCount>,
ctx: &mut ModelContext<Self>,
) {
self.hidden_lines.update(ctx, |model, ctx| {
@@ -573,7 +573,7 @@ impl CodeEditorModel {
// Set the following hidden line ranges to be visible. This is no-op if the lines are already visible.
pub fn set_visible_line_range(
&mut self,
range: Range<warp_editor::content::text::LineCount>,
range: Range<galaxy_editor::content::text::LineCount>,
ctx: &mut ModelContext<Self>,
) {
let version = self.content().as_ref(ctx).buffer_version();
@@ -1293,7 +1293,7 @@ impl CodeEditorModel {
let line_count = self.line_count(ctx);
// Calculate the visible line ranges (with context)
let mut visible_ranges: RangeSet<warp_editor::content::text::LineCount> =
let mut visible_ranges: RangeSet<galaxy_editor::content::text::LineCount> =
RangeSet::new();
// Add ranges for diffs
@@ -1311,14 +1311,14 @@ impl CodeEditorModel {
}
// Calculate hidden ranges as the complement of visible ranges
let all_lines: Range<warp_editor::content::text::LineCount> =
warp_editor::content::text::LineCount::from(0)
..warp_editor::content::text::LineCount::from(line_count);
let all_lines: Range<galaxy_editor::content::text::LineCount> =
galaxy_editor::content::text::LineCount::from(0)
..galaxy_editor::content::text::LineCount::from(line_count);
// Find gaps in the visible ranges
let hidden_ranges = visible_ranges
.gaps(&all_lines)
.collect::<RangeSet<warp_editor::content::text::LineCount>>();
.collect::<RangeSet<galaxy_editor::content::text::LineCount>>();
self.set_hidden_lines(hidden_ranges, ctx);
}
@@ -2085,10 +2085,10 @@ impl CodeEditorModel {
self.update_content(
|mut content, ctx| {
content.apply_edit(
warp_editor::content::buffer::BufferEditAction::InsertForEachSelection {
galaxy_editor::content::buffer::BufferEditAction::InsertForEachSelection {
texts: &texts,
},
warp_editor::content::buffer::EditOrigin::UserTyped,
galaxy_editor::content::buffer::EditOrigin::UserTyped,
selection_model,
ctx,
);
@@ -2119,10 +2119,10 @@ impl CodeEditorModel {
self.update_content(
|mut content, ctx| {
content.apply_edit(
warp_editor::content::buffer::BufferEditAction::InsertAtCharOffsetRanges {
galaxy_editor::content::buffer::BufferEditAction::InsertAtCharOffsetRanges {
edits: &edits,
},
warp_editor::content::buffer::EditOrigin::UserTyped,
galaxy_editor::content::buffer::EditOrigin::UserTyped,
selection_model,
ctx,
);
@@ -3721,10 +3721,10 @@ impl CoreEditorModel for CodeEditorModel {
}
// TODO(kevin): Add validation to the content model.
fn validate(&self, _ctx: &impl warpui::ModelAsRef) {}
fn validate(&self, _ctx: &impl galaxyui::ModelAsRef) {}
// Since this is a plain text editor, there is no text styles.
fn active_text_style(&self) -> warp_editor::content::text::TextStyles {
fn active_text_style(&self) -> galaxy_editor::content::text::TextStyles {
Default::default()
}
app/src/code/editor/model_tests.rs
+4 -4
View File
@@ -1,10 +1,10 @@
use futures::channel::oneshot;
use std::path::Path;
use vec1::vec1;
use warp_editor::content::buffer::{InitialBufferState, SelectionOffsets};
use warp_editor::multiline::MultilineString;
use warp_util::content_version::ContentVersion;
use warpui::App;
use galaxy_editor::content::buffer::{InitialBufferState, SelectionOffsets};
use galaxy_editor::multiline::MultilineString;
use galaxy_util::content_version::ContentVersion;
use galaxyui::App;
use crate::{
code::editor::line::EditorLineLocation, code::editor::view::code_text_styles,
app/src/code/editor/nav_bar.rs
+3 -3
View File
@@ -1,9 +1,9 @@
#![cfg_attr(target_family = "wasm", allow(dead_code, unused_imports))]
// Adding this file level gate as some of the code around editability is not used in WASM yet.
use warp_core::ui::{appearance::Appearance, theme::Fill};
use warp_editor::model::CoreEditorModel;
use warpui::{
use galaxy_core::ui::{appearance::Appearance, theme::Fill};
use galaxy_editor::model::CoreEditorModel;
use galaxyui::{
elements::{
Align, Border, ConstrainedBox, Container, CrossAxisAlignment, Flex, MouseStateHandle,
ParentElement, Shrinkable,
app/src/code/editor/scroll.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use warp_editor::content::version::BufferVersion;
use warp_util::path::LineAndColumnArg;
use galaxy_editor::content::version::BufferVersion;
use galaxy_util::path::LineAndColumnArg;
#[derive(Debug, Clone, Copy)]
pub enum ScrollWheelBehavior {
app/src/code/editor/view.rs
+21 -21
View File
@@ -40,8 +40,8 @@ use std::{collections::HashSet, path::Path};
use string_offset::CharOffset;
use vec1::{vec1, Vec1};
use vim::vim::{Direction, InsertPosition, VimMode, VimModel, VimState, VimSubscriber};
use warp_core::platform::SessionPlatform;
use warp_editor::{
use galaxy_core::platform::SessionPlatform;
use galaxy_editor::{
content::{
buffer::{
Buffer, BufferEditAction, EditOrigin, InitialBufferState, ToBufferCharOffset as _,
@@ -64,8 +64,8 @@ use warp_editor::{
},
search::{SearchEvent, Searcher, MATCH_FILL, SELECTED_MATCH_FILL},
};
use warp_util::content_version::ContentVersion;
use warpui::{
use galaxy_util::content_version::ContentVersion;
use galaxyui::{
elements::{
new_scrollable::{
AxisConfiguration, DualAxisConfig, NewScrollableElement, ScrollableAppearance,
@@ -403,11 +403,11 @@ impl CodeEditorView {
// from truncating space for the code editor. We should not render it as an overlay
// for small code editors.
horizontal_scrollbar_appearance: ScrollableAppearance::new(
warpui::elements::ScrollbarWidth::Auto,
galaxyui::elements::ScrollbarWidth::Auto,
false,
),
vertical_scrollbar_appearance: ScrollableAppearance::new(
warpui::elements::ScrollbarWidth::Auto,
galaxyui::elements::ScrollbarWidth::Auto,
false,
),
gutter_hover_target: GutterHoverTarget::GutterElement,
@@ -877,21 +877,21 @@ impl CodeEditorView {
let hidden_section_end = line_range.end.as_usize();
let lines_to_unhide = match expansion_type {
ExpansionType::Both => {
warp_editor::content::text::LineCount::from(hidden_section_start)
..warp_editor::content::text::LineCount::from(hidden_section_end)
galaxy_editor::content::text::LineCount::from(hidden_section_start)
..galaxy_editor::content::text::LineCount::from(hidden_section_end)
}
ExpansionType::ExpandDown => {
let end = hidden_section_end
.min(hidden_section_start + CODE_EDITOR_HIDDEN_SECTION_EXPANSION_LINES);
warp_editor::content::text::LineCount::from(hidden_section_start)
..warp_editor::content::text::LineCount::from(end)
galaxy_editor::content::text::LineCount::from(hidden_section_start)
..galaxy_editor::content::text::LineCount::from(end)
}
ExpansionType::ExpandUp => {
let start = hidden_section_start.max(
hidden_section_end.saturating_sub(CODE_EDITOR_HIDDEN_SECTION_EXPANSION_LINES),
);
warp_editor::content::text::LineCount::from(start)
..warp_editor::content::text::LineCount::from(hidden_section_end)
galaxy_editor::content::text::LineCount::from(start)
..galaxy_editor::content::text::LineCount::from(hidden_section_end)
}
};
self.model.update(ctx, |model, ctx| {
@@ -997,12 +997,12 @@ impl CodeEditorView {
if let Some(results) = self.searcher.as_ref(ctx).results() {
if !results.matches.is_empty() {
// Convert all match ranges to selection offsets
let selection_offsets: Vec<warp_editor::content::buffer::SelectionOffsets> =
let selection_offsets: Vec<galaxy_editor::content::buffer::SelectionOffsets> =
results
.matches
.iter()
.map(|match_result| {
warp_editor::content::buffer::SelectionOffsets {
galaxy_editor::content::buffer::SelectionOffsets {
head: match_result.end,
tail: match_result.start,
}
@@ -1014,8 +1014,8 @@ impl CodeEditorView {
self.model.update(ctx, |model, ctx| {
model.selection().update(ctx, |selection_model, ctx| {
selection_model.update_selection(
warp_editor::content::buffer::BufferSelectAction::SetSelectionOffsets { selections },
warp_editor::content::buffer::AutoScrollBehavior::Selection,
galaxy_editor::content::buffer::BufferSelectAction::SetSelectionOffsets { selections },
galaxy_editor::content::buffer::AutoScrollBehavior::Selection,
ctx,
);
});
@@ -1041,7 +1041,7 @@ impl CodeEditorView {
self.model.update(ctx, |model, ctx| {
model.update_content( |mut content_model, ctx| {
content_model.apply_edit(
warp_editor::content::buffer::BufferEditAction::InsertAtCharOffsetRanges { edits: &edits },
galaxy_editor::content::buffer::BufferEditAction::InsertAtCharOffsetRanges { edits: &edits },
EditOrigin::UserInitiated,
selection_model,
ctx,
@@ -1093,7 +1093,7 @@ impl CodeEditorView {
self.model.update(ctx, |model, ctx| {
model.update_content(|mut content_model, ctx| {
content_model.apply_edit(
warp_editor::content::buffer::BufferEditAction::InsertAtCharOffsetRanges { edits: &edits },
galaxy_editor::content::buffer::BufferEditAction::InsertAtCharOffsetRanges { edits: &edits },
EditOrigin::UserInitiated,
selection_model,
ctx,
@@ -2008,8 +2008,8 @@ impl CodeEditorView {
self.model.update(ctx, |model, ctx| {
model.selection_model().update(ctx, |selection, ctx| {
selection.update_selection(
warp_editor::content::buffer::BufferSelectAction::MoveRight,
warp_editor::content::buffer::AutoScrollBehavior::Selection,
galaxy_editor::content::buffer::BufferSelectAction::MoveRight,
galaxy_editor::content::buffer::AutoScrollBehavior::Selection,
ctx,
);
});
@@ -2341,7 +2341,7 @@ impl View for CodeEditorView {
}
}
fn keymap_context(&self, app: &AppContext) -> warpui::keymap::Context {
fn keymap_context(&self, app: &AppContext) -> galaxyui::keymap::Context {
let mut context = Self::default_keymap_context();
if self.interaction_state(app) != InteractionState::Editable {
app/src/code/editor/view/actions.rs
+5 -5
View File
@@ -18,7 +18,7 @@ use std::collections::{HashMap, HashSet};
use std::fmt::Debug;
use std::ops::Range;
use string_offset::CharOffset;
use warp_editor::{
use galaxy_editor::{
content::version::BufferVersion,
editor::{EmbeddedItemModel, RunnableCommandModel, TextDecoration},
model::{CoreEditorModel, PlainTextEditorModel},
@@ -28,8 +28,8 @@ use warp_editor::{
},
selection::{TextDirection, TextUnit},
};
use warp_util::user_input::UserInput;
use warpui::{
use galaxy_util::user_input::UserInput;
use galaxyui::{
actions::StandardAction,
elements::Axis,
event::ModifiersState,
@@ -48,7 +48,7 @@ lazy_static! {
}
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
let text_entry = id!("CodeEditorView") & !id!("IMEOpen");
// We use this to disable some keybindings that would conflict with the Agent Mode embedded editor.
@@ -1109,7 +1109,7 @@ impl TypedActionView for CodeEditorView {
}
}
impl warp_editor::editor::EditorView for CodeEditorView {
impl galaxy_editor::editor::EditorView for CodeEditorView {
type RichTextAction = CodeEditorViewAction;
fn runnable_command_at<'a>(
app/src/code/editor/view/view_tests.rs
+4 -4
View File
@@ -1,7 +1,7 @@
use std::sync::Arc;
use warp_core::ui::appearance::Appearance;
use warp_editor::render::element::VerticalExpansionBehavior;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_editor::render::element::VerticalExpansionBehavior;
use galaxyui::{
elements::{new_scrollable::ScrollableAppearance, ScrollbarWidth},
platform::WindowStyle,
App, TypedActionView, ViewHandle, WindowId,
@@ -21,7 +21,7 @@ use crate::{
};
use super::{CodeEditorRenderOptions, CodeEditorView, CodeEditorViewAction};
use warp_util::user_input::UserInput;
use galaxy_util::user_input::UserInput;
fn initialize_editor(app: &mut App) -> (WindowId, ViewHandle<CodeEditorView>) {
initialize_settings_for_tests(app);
app/src/code/editor/view/vim_handler.rs
+3 -3
View File
@@ -12,7 +12,7 @@ use vim::vim::{
InsertPosition, LineMotion, ModeTransition, MotionType, TextObjectType, VimHandler, VimMode,
VimMotion, VimOperand, VimOperator, VimTextObject, WordMotion,
};
use warp_editor::{
use galaxy_editor::{
content::buffer::{
AutoScrollBehavior, BufferEditAction, EditOrigin, SelectionOffsets,
ToBufferCharOffset as _, VimInsertPoint,
@@ -20,7 +20,7 @@ use warp_editor::{
model::{CoreEditorModel, PlainTextEditorModel},
selection::{TextDirection, TextUnit},
};
use warpui::{text::point::Point, SingletonEntity, ViewContext};
use galaxyui::{text::point::Point, SingletonEntity, ViewContext};
impl VimHandler for CodeEditorView {
fn insert_char(&mut self, c: char, ctx: &mut ViewContext<Self>) {
@@ -154,7 +154,7 @@ impl VimHandler for CodeEditorView {
) {
// Selection logic is almost the same for all operators, so capture that in a closure first.
let selection_change =
|model: &mut CodeEditorModel, ctx: &mut warpui::ModelContext<CodeEditorModel>| {
|model: &mut CodeEditorModel, ctx: &mut galaxyui::ModelContext<CodeEditorModel>| {
match operand {
VimOperand::Motion {
motion,
app/src/code/editor/view/vim_handler_tests.rs
+6 -6
View File
@@ -16,15 +16,15 @@ use crate::{
use std::sync::Arc;
use unindent::Unindent;
use vim::vim::{MotionType, VimMode};
use warp_core::{features::FeatureFlag, settings::Setting, ui::appearance::Appearance};
use warp_editor::model::CoreEditorModel;
use warp_editor::{
use galaxy_core::{features::FeatureFlag, settings::Setting, ui::appearance::Appearance};
use galaxy_editor::model::CoreEditorModel;
use galaxy_editor::{
content::buffer::{InitialBufferState, ToBufferCharOffset, ToBufferPoint},
render::element::VerticalExpansionBehavior,
};
use warp_util::user_input::UserInput;
use warpui::text::point::Point;
use warpui::{
use galaxy_util::user_input::UserInput;
use galaxyui::text::point::Point;
use galaxyui::{
keymap::Keystroke, platform::WindowStyle, App, SingletonEntity, TypedActionView, UpdateModel,
ViewHandle,
};
app/src/code/editor_management.rs
+2 -2
View File
@@ -6,8 +6,8 @@ use std::{
use crate::ai::skills::SkillOpenOrigin;
use ai::skills::SkillReference;
use serde::{Deserialize, Serialize};
use warp_util::path::LineAndColumnArg;
use warpui::{AppContext, Entity, EntityId, ModelContext, SingletonEntity, ViewHandle, WindowId};
use galaxy_util::path::LineAndColumnArg;
use galaxyui::{AppContext, Entity, EntityId, ModelContext, SingletonEntity, ViewHandle, WindowId};
use crate::{
ai::agent::AIAgentActionId,
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(),
app/src/code/find_references_view.rs
+13 -13
View File
@@ -8,11 +8,11 @@ use std::{collections::HashMap, path::PathBuf};
use lsp::ReferenceLocation;
use pathfinder_geometry::vector::Vector2F;
use string_offset::CharOffset;
use warp_core::ui::{
use galaxy_core::ui::{
appearance::Appearance, icons::Icon as WarpIcon, theme::color::internal_colors,
};
use warp_files::FileModel;
use warpui::{
use galaxy_files::FileModel;
use galaxyui::{
elements::{
Border, ChildAnchor, ChildView, ClippedScrollStateHandle, ClippedScrollable,
ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Fill, Flex, Hoverable,
@@ -26,14 +26,14 @@ use warpui::{
};
use crate::search::result_renderer::ItemHighlightState;
use warpui::ui_components::components::UiComponent;
use galaxyui::ui_components::components::UiComponent;
use super::{
editor::view::{CodeEditorRenderOptions, CodeEditorView},
global_buffer_model::GlobalBufferModel,
};
use crate::editor::InteractionState;
use warp_editor::{
use galaxy_editor::{
content::buffer::InitialBufferState, render::element::VerticalExpansionBehavior,
};
@@ -43,7 +43,7 @@ pub const FIND_REFERENCES_CARD_MAX_HEIGHT: f32 = 300.;
const HAS_REFERENCES: &str = "HasReferences";
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_fixed_bindings([
FixedBinding::new(
@@ -322,15 +322,15 @@ impl FindReferencesView {
.with_can_show_diff_ui(false)
.with_show_line_numbers(false)
.with_horizontal_scrollbar_appearance(
warpui::elements::new_scrollable::ScrollableAppearance::new(
warpui::elements::ScrollbarWidth::None,
galaxyui::elements::new_scrollable::ScrollableAppearance::new(
galaxyui::elements::ScrollbarWidth::None,
false,
),
);
editor_view.set_vertical_scrollbar_appearance(
warpui::elements::new_scrollable::ScrollableAppearance::new(
warpui::elements::ScrollbarWidth::None,
galaxyui::elements::new_scrollable::ScrollableAppearance::new(
galaxyui::elements::ScrollbarWidth::None,
false,
),
);
@@ -403,7 +403,7 @@ impl View for FindReferencesView {
"FindReferencesView"
}
fn keymap_context(&self, _app: &AppContext) -> warpui::keymap::Context {
fn keymap_context(&self, _app: &AppContext) -> galaxyui::keymap::Context {
let mut context = Self::default_keymap_context();
if !self.references.is_empty() {
context.set.insert(HAS_REFERENCES);
@@ -413,7 +413,7 @@ impl View for FindReferencesView {
fn render(&self, app: &AppContext) -> Box<dyn Element> {
if self.references.is_empty() {
return warpui::elements::Empty::new().finish();
return galaxyui::elements::Empty::new().finish();
}
let appearance = Appearance::handle(app).as_ref(app);
@@ -520,7 +520,7 @@ fn render_header(
let icon_color = theme.sub_text_color(theme.background());
let close_button = Hoverable::new(back_mouse_state, move |state| {
let close_icon = ConstrainedBox::new(
warpui::elements::Icon::new(WarpIcon::X.into(), icon_color).finish(),
galaxyui::elements::Icon::new(WarpIcon::X.into(), icon_color).finish(),
)
.with_width(16.)
.with_height(16.)
app/src/code/footer.rs
+18 -18
View File
@@ -6,30 +6,30 @@ use lsp::{
LanguageId, LanguageServerId, LspManagerModel, LspManagerModelEvent, LspServerModel,
LspState as LspModelState,
};
use warp_core::send_telemetry_from_ctx;
use galaxy_core::send_telemetry_from_ctx;
use crate::code::lsp_telemetry::{LspControlActionType, LspEnablementSource, LspTelemetryEvent};
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::{Fill as ThemeFill, WarpTheme};
use warp_core::ui::{appearance::Appearance, Icon};
use warpui::elements::{
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::{Fill as ThemeFill, WarpTheme};
use galaxy_core::ui::{appearance::Appearance, Icon};
use galaxyui::elements::{
ChildAnchor, ChildView, Dismiss, Empty, Hoverable, MainAxisSize, MouseStateHandle,
ParentAnchor, ParentOffsetBounds, Rect, Shrinkable,
};
use warpui::platform::Cursor;
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
use warpui::{
use galaxyui::platform::Cursor;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::{
elements::{
Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Fill, Flex,
MainAxisAlignment, OffsetPositioning, Padding, ParentElement, Radius, Stack,
},
AppContext, Element, Entity, ModelHandle, SingletonEntity, View, WeakModelHandle,
};
use warpui::{TypedActionView, ViewContext, ViewHandle};
use galaxyui::{TypedActionView, ViewContext, ViewHandle};
use warp_core::ui::theme::AnsiColorIdentifier;
use galaxy_core::ui::theme::AnsiColorIdentifier;
#[cfg(feature = "local_fs")]
use crate::ai::persisted_workspace::PersistedWorkspaceEvent;
@@ -289,7 +289,7 @@ impl CodeFooterView {
Container::new(
ConstrainedBox::new(
Icon::Info
.to_warpui_icon(theme.active_ui_text_color())
.to_galaxyui_icon(theme.active_ui_text_color())
.finish(),
)
.with_width(12.)
@@ -1170,7 +1170,7 @@ impl CodeFooterView {
mouse_states.open_logs.clone(),
move || {
Icon::Code1
.to_warpui_icon(ThemeFill::Solid(text_color))
.to_galaxyui_icon(ThemeFill::Solid(text_color))
.finish()
},
"Open logs",
@@ -1192,7 +1192,7 @@ impl CodeFooterView {
mouse_states.restart_server.clone(),
move || {
Icon::RefreshCcw
.to_warpui_icon(ThemeFill::Solid(text_color))
.to_galaxyui_icon(ThemeFill::Solid(text_color))
.finish()
},
"Restart server",
@@ -1237,7 +1237,7 @@ impl CodeFooterView {
mouse_states.start_server.clone(),
move || {
Icon::Play
.to_warpui_icon(ThemeFill::Solid(text_color))
.to_galaxyui_icon(ThemeFill::Solid(text_color))
.finish()
},
"Start server",
@@ -1259,7 +1259,7 @@ impl CodeFooterView {
mouse_states.remove_server.clone(),
move || {
Icon::Trash
.to_warpui_icon(ThemeFill::Solid(text_color))
.to_galaxyui_icon(ThemeFill::Solid(text_color))
.finish()
},
"Remove server",
@@ -1282,7 +1282,7 @@ impl CodeFooterView {
mouse_states.restart_all.clone(),
move || {
Icon::RefreshCcw
.to_warpui_icon(ThemeFill::Solid(text_color))
.to_galaxyui_icon(ThemeFill::Solid(text_color))
.finish()
},
if is_plural {
@@ -1338,7 +1338,7 @@ impl CodeFooterView {
mouse_states.start_all.clone(),
move || {
Icon::Play
.to_warpui_icon(ThemeFill::Solid(text_color))
.to_galaxyui_icon(ThemeFill::Solid(text_color))
.finish()
},
if !is_plural {
@@ -1366,7 +1366,7 @@ impl CodeFooterView {
mouse_states.manage_servers.clone(),
move || {
Icon::Gear
.to_warpui_icon(ThemeFill::Solid(text_color))
.to_galaxyui_icon(ThemeFill::Solid(text_color))
.finish()
},
"Manage servers",
app/src/code/global_buffer_model.rs
+15 -15
View File
@@ -9,22 +9,22 @@ use futures_util::stream::AbortHandle;
use lsp::types::TextDocumentContentChangeEvent;
use lsp::{LspManagerModel, LspServerLogLevel, LspServerModel};
use vec1::vec1;
use warp_core::features::FeatureFlag;
use warp_editor::content::buffer::Buffer;
use warp_editor::content::diff::{text_diff, TextDiff};
use warp_editor::content::edit::PreciseDelta;
use warp_editor::content::version::BufferVersion;
use warp_util::content_version::ContentVersion;
use warp_util::file::{FileId, FileLoadError, FileSaveError};
use warpui::{Entity, ModelContext, ModelHandle, SingletonEntity, WeakModelHandle};
use galaxy_core::features::FeatureFlag;
use galaxy_editor::content::buffer::Buffer;
use galaxy_editor::content::diff::{text_diff, TextDiff};
use galaxy_editor::content::edit::PreciseDelta;
use galaxy_editor::content::version::BufferVersion;
use galaxy_util::content_version::ContentVersion;
use galaxy_util::file::{FileId, FileLoadError, FileSaveError};
use galaxyui::{Entity, ModelContext, ModelHandle, SingletonEntity, WeakModelHandle};
cfg_if::cfg_if! {
if #[cfg(feature = "local_fs")] {
use lsp::LspManagerModelEvent;
use warp_files::{FileModelEvent, FileModel};
use warp_editor::content::text::IndentBehavior;
use warp_editor::content::text::IndentUnit;
use warp_editor::content::buffer::EditOrigin;
use galaxy_files::{FileModelEvent, FileModel};
use galaxy_editor::content::text::IndentBehavior;
use galaxy_editor::content::text::IndentUnit;
use galaxy_editor::content::buffer::EditOrigin;
}
}
@@ -682,7 +682,7 @@ impl GlobalBufferModel {
// Subscribe to buffer events for LSP sync.
let path_clone = path.clone();
ctx.subscribe_to_model(&buffer, move |me, event, ctx| {
use warp_editor::content::buffer::BufferEvent;
use galaxy_editor::content::buffer::BufferEvent;
let Some(state) = me.buffers.get(&file_id) else {
return;
@@ -787,7 +787,7 @@ impl GlobalBufferModel {
let path_clone = path.to_path_buf();
ctx.subscribe_to_model(&buffer, move |me, event, ctx| {
use warp_editor::content::buffer::BufferEvent;
use galaxy_editor::content::buffer::BufferEvent;
let Some(state) = me.buffers.get(&file_id) else {
me.log_lsp_sync_debug(
@@ -920,7 +920,7 @@ impl GlobalBufferModel {
line_numbers: Vec<usize>,
ctx: &mut ModelContext<Self>,
) -> Option<Vec<(usize, String)>> {
use warp_editor::content::text::LineCount;
use galaxy_editor::content::text::LineCount;
if line_numbers.is_empty() {
return Some(Vec::new());
app/src/code/icon.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use std::path::Path;
use warp_core::ui::appearance::Appearance;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{
assets::asset_cache::AssetSource,
elements::{CacheOption, Icon, Image},
Element,
app/src/code/inline_diff.rs
+7 -7
View File
@@ -4,15 +4,15 @@ use std::rc::Rc;
use crate::ai::blocklist::inline_action::code_diff_view::DiffSessionType;
use ai::diff_validation::DiffType;
#[cfg(not(target_family = "wasm"))]
use warp_files::{FileModel, FileModelEvent};
use warp_util::file::FileId;
use galaxy_files::{FileModel, FileModelEvent};
use galaxy_util::file::FileId;
#[cfg(not(target_family = "wasm"))]
use warp_util::file::FileSaveError;
use warp_util::standardized_path::StandardizedPath;
use warpui::elements::ChildView;
use galaxy_util::file::FileSaveError;
use galaxy_util::standardized_path::StandardizedPath;
use galaxyui::elements::ChildView;
#[cfg(not(target_family = "wasm"))]
use warpui::SingletonEntity;
use warpui::{AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle};
use galaxyui::SingletonEntity;
use galaxyui::{AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle};
use super::diff_viewer::DiffViewer;
use super::diff_viewer::DisplayMode;
app/src/code/language_server_extension.rs
+5 -5
View File
@@ -2,15 +2,15 @@ use lsp::{HoverContents, LspServerLogLevel, MarkupKind};
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use num_traits::SaturatingSub;
use string_offset::CharOffset;
use warp_core::ui::{
use galaxy_core::ui::{
appearance::Appearance,
theme::{color::internal_colors, WarpTheme},
};
use warp_editor::{
use galaxy_editor::{
content::buffer::InitialBufferState,
render::{element::VerticalExpansionBehavior, model::Decoration},
};
use warpui::{
use galaxyui::{
elements::{
Border, ChildView, ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox, Container,
CornerRadius, CrossAxisAlignment, Flex, FormattedTextElement, HighlightedHyperlink,
@@ -27,7 +27,7 @@ use crate::editor::InteractionState;
use super::editor::view::{CodeEditorRenderOptions, CodeEditorView};
use super::lsp_telemetry::LspTelemetryEvent;
use warp_core::send_telemetry_from_ctx;
use galaxy_core::send_telemetry_from_ctx;
/// A processed diagnostic with its converted offset range.
/// Stored on LocalCodeEditorView and used for both decoration and hover display.
@@ -549,7 +549,7 @@ impl LocalCodeEditorView {
ScrollbarWidth::Auto,
theme.disabled_ui_text_color().into(),
theme.active_ui_text_color().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.finish();
app/src/code/language_server_shutdown_manager.rs
+2 -2
View File
@@ -12,8 +12,8 @@ use std::time::Duration;
use futures::stream::AbortHandle;
use lsp::LspManagerModel;
use warpui::r#async::Timer;
use warpui::{AppContext, Entity, ModelContext, SingletonEntity};
use galaxyui::r#async::Timer;
use galaxyui::{AppContext, Entity, ModelContext, SingletonEntity};
use crate::code::local_code_editor::LocalCodeEditorView;
use crate::terminal::TerminalView;
app/src/code/local_code_editor.rs
+11 -11
View File
@@ -20,17 +20,17 @@ use num_traits::SaturatingSub;
use pathfinder_geometry::{rect::RectF, vector::Vector2F};
use string_offset::CharOffset;
use vec1::Vec1;
use warp_core::{features::FeatureFlag, ui::appearance::Appearance};
use warp_editor::{
use galaxy_core::{features::FeatureFlag, ui::appearance::Appearance};
use galaxy_editor::{
content::{buffer::InitialBufferState, text::IndentUnit},
render::model::{Decoration, LineCount},
};
use warp_util::{
use galaxy_util::{
content_version::ContentVersion,
file::{FileId, FileLoadError, FileSaveError},
path::to_relative_path,
};
use warpui::{
use galaxyui::{
elements::{
Border, ChildAnchor, ChildView, ClippedScrollStateHandle, ConstrainedBox, Container,
CornerRadius, CrossAxisAlignment, DropShadow, Flex, Hoverable, MainAxisAlignment,
@@ -46,7 +46,7 @@ use warpui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
WindowId,
};
use warpui::{platform::SaveFilePickerConfiguration, ModelHandle};
use galaxyui::{platform::SaveFilePickerConfiguration, ModelHandle};
use crate::menu::{Event, Menu, MenuItem, MenuItemFields};
@@ -71,7 +71,7 @@ use pathfinder_color::ColorU;
#[cfg(feature = "local_fs")]
use repo_metadata::repositories::DetectedRepositories;
use vim::vim::{MotionType, VimMode};
use warp_core::ui::icons::Icon;
use galaxy_core::ui::icons::Icon;
use crate::ai::persisted_workspace::{PersistedWorkspace, PersistedWorkspaceEvent};
use crate::workspace::WorkspaceAction;
@@ -94,7 +94,7 @@ use super::find_references_view::{FindReferencesView, FindReferencesViewEvent};
use super::language_server_extension::ProcessedDiagnostic;
use super::lsp_telemetry::LspTelemetryEvent;
use super::ImmediateSaveError;
use warp_core::send_telemetry_from_ctx;
use galaxy_core::send_telemetry_from_ctx;
type SaveCallback =
Box<dyn FnOnce(SaveOutcome, &mut ViewContext<LocalCodeEditorView>) + Send + Sync + 'static>;
@@ -651,7 +651,7 @@ impl LocalCodeEditorView {
let window_id = ctx.window_id();
// Create the on-click action based on whether we have a definition
let on_click: Box<dyn Fn(&mut warpui::AppContext)> = if has_different_definition {
let on_click: Box<dyn Fn(&mut galaxyui::AppContext)> = if has_different_definition {
let target_location = definition_locations.first().unwrap().target.clone();
Box::new(move |app| {
app.dispatch_typed_action_for_view(
@@ -2081,13 +2081,13 @@ impl View for LocalCodeEditorView {
"LocalCodeEditorView"
}
fn on_focus(&mut self, focus_ctx: &warpui::FocusContext, ctx: &mut ViewContext<Self>) {
fn on_focus(&mut self, focus_ctx: &galaxyui::FocusContext, ctx: &mut ViewContext<Self>) {
if focus_ctx.is_self_focused() {
self.editor.update(ctx, |editor, ctx| editor.focus(ctx));
}
}
fn render(&self, app: &AppContext) -> Box<dyn warpui::Element> {
fn render(&self, app: &AppContext) -> Box<dyn galaxyui::Element> {
// Rendering the version conflict banner.
let base: Box<dyn Element> = if self.has_version_conflicts(app) {
let appearance = Appearance::as_ref(app);
@@ -2284,7 +2284,7 @@ pub fn render_unsaved_changes_banner(
Container::new(
ConstrainedBox::new(
Icon::Warning
.to_warpui_icon(appearance.theme().active_ui_text_color())
.to_galaxyui_icon(appearance.theme().active_ui_text_color())
.finish(),
)
.with_height(16.)
app/src/code/local_code_editor_wasm.rs
+6 -6
View File
@@ -5,9 +5,9 @@ use std::{
use std::ops::Range;
use warp_editor::{content::buffer::InitialBufferState, render::model::LineCount};
use warp_util::file::{FileLoadError, FileSaveError};
use warpui::{
use galaxy_editor::{content::buffer::InitialBufferState, render::model::LineCount};
use galaxy_util::file::{FileLoadError, FileSaveError};
use galaxyui::{
elements::MouseStateHandle, AppContext, Element, Entity, TypedActionView, View, ViewContext,
ViewHandle, WindowId,
};
@@ -18,7 +18,7 @@ use super::editor::view::CodeEditorView;
use super::ImmediateSaveError;
use crate::terminal::TerminalView;
use crate::{code::editor::EditorReviewComment, code_review::comments::CommentId};
use warp_core::ui::appearance::Appearance;
use galaxy_core::ui::appearance::Appearance;
pub use super::diff_viewer::DisplayMode;
@@ -111,7 +111,7 @@ impl View for LocalCodeEditorView {
"LocalCodeEditorView"
}
fn render(&self, _app: &AppContext) -> Box<dyn Element> {
warpui::elements::Empty::new().finish()
galaxyui::elements::Empty::new().finish()
}
}
@@ -128,5 +128,5 @@ pub fn render_unsaved_circle_with_tooltip(
_right_margin: f32,
_appearance: &Appearance,
) -> Box<dyn Element> {
warpui::elements::Empty::new().finish()
galaxyui::elements::Empty::new().finish()
}
app/src/code/lsp_telemetry.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use serde::{Deserialize, Serialize};
use serde_json::{json, Value};
use strum_macros::{EnumDiscriminants, EnumIter};
use warp_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
/// The source from which the user enabled an LSP server.
#[derive(Clone, Debug, Serialize, Deserialize)]
@@ -160,7 +160,7 @@ impl TelemetryEvent for LspTelemetryEvent {
}
fn event_descs() -> impl Iterator<Item = Box<dyn TelemetryEventDesc>> {
warp_core::telemetry::enum_events::<Self>()
galaxy_core::telemetry::enum_events::<Self>()
}
}
@@ -200,4 +200,4 @@ impl TelemetryEventDesc for LspTelemetryEventDiscriminants {
}
}
warp_core::register_telemetry_event!(LspTelemetryEvent);
galaxy_core::register_telemetry_event!(LspTelemetryEvent);
app/src/code/mod.rs
+3 -3
View File
@@ -2,9 +2,9 @@ use pathfinder_geometry::rect::RectF;
use std::any::Any;
use std::fmt::Debug;
use std::ops::AddAssign;
use warp_util::file::FileSaveError;
use warpui::elements::DropTargetData;
use warpui::AppContext;
use galaxy_util::file::FileSaveError;
use galaxyui::elements::DropTargetData;
use galaxyui::AppContext;
#[cfg(not(target_family = "wasm"))]
pub mod find_references_view;
app/src/code/opened_files.rs
+1 -1
View File
@@ -4,7 +4,7 @@
use std::{collections::HashMap, path::PathBuf};
use instant::Instant;
use warpui::{Entity, ModelContext, SingletonEntity};
use galaxyui::{Entity, ModelContext, SingletonEntity};
#[derive(Default, Clone)]
pub struct OpenedFilesInRepo(HashMap<PathBuf, Instant>);
app/src/code/view.rs
+16 -16
View File
@@ -28,20 +28,20 @@ use pathfinder_geometry::rect::RectF;
use pathfinder_geometry::vector::vec2f;
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use warp_core::channel::{Channel, ChannelState};
use warp_core::features::FeatureFlag;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::icons::ICON_DIMENSIONS;
use warp_editor::render::element::VerticalExpansionBehavior;
use warp_util::path::LineAndColumnArg;
use warpui::elements::Rect;
use warpui::fonts::Style;
use warpui::text::point::Point;
use warpui::text_layout::ClipConfig;
use galaxy_core::channel::{Channel, ChannelState};
use galaxy_core::features::FeatureFlag;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::icons::ICON_DIMENSIONS;
use galaxy_editor::render::element::VerticalExpansionBehavior;
use galaxy_util::path::LineAndColumnArg;
use galaxyui::elements::Rect;
use galaxyui::fonts::Style;
use galaxyui::text::point::Point;
use galaxyui::text_layout::ClipConfig;
#[cfg(feature = "local_fs")]
use warpui::clipboard::ClipboardContent;
use warpui::{
use galaxyui::clipboard::ClipboardContent;
use galaxyui::{
elements::{
AcceptedByDropTarget, Align, Border, ChildAnchor, ChildView, Clipped, ConstrainedBox,
Container, CornerRadius, CrossAxisAlignment, Draggable, DraggableState, DropTarget, Empty,
@@ -378,8 +378,8 @@ impl CodeView {
ctx,
)
.with_horizontal_scrollbar_appearance(
warpui::elements::new_scrollable::ScrollableAppearance::new(
warpui::elements::ScrollbarWidth::Auto,
galaxyui::elements::new_scrollable::ScrollableAppearance::new(
galaxyui::elements::ScrollbarWidth::Auto,
true,
),
)
@@ -419,8 +419,8 @@ impl CodeView {
ctx,
)
.with_horizontal_scrollbar_appearance(
warpui::elements::new_scrollable::ScrollableAppearance::new(
warpui::elements::ScrollbarWidth::Auto,
galaxyui::elements::new_scrollable::ScrollableAppearance::new(
galaxyui::elements::ScrollbarWidth::Auto,
true,
),
)
app/src/code/wasm.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use std::path::{Path, PathBuf};
use warp_util::path::LineAndColumnArg;
use warpui::{
use galaxy_util::path::LineAndColumnArg;
use galaxyui::{
elements::{DraggableState, Empty, MouseStateHandle},
AppContext, Element, Entity, ModelHandle, TypedActionView, View, ViewContext, ViewHandle,
};