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/editor/accept_autosuggestion_keybinding_view.rs
+11 -11
View File
@@ -13,24 +13,24 @@ use crate::util::bindings::{
use crate::workspace::WorkspaceAction;
use lazy_static::lazy_static;
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::theme::Fill;
use warpui::elements::{Border, ChildView, Flex, ParentElement};
use warpui::elements::{
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::{Border, ChildView, Flex, ParentElement};
use galaxyui::elements::{
ConstrainedBox, Container, CrossAxisAlignment, Radius, DEFAULT_UI_LINE_HEIGHT_RATIO,
};
use warpui::keymap::Keystroke;
use warpui::platform::Cursor;
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
use warpui::ui_components::keyboard_shortcut::KeyboardShortcut;
use warpui::ViewContext;
use warpui::{
use galaxyui::keymap::Keystroke;
use galaxyui::platform::Cursor;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::ui_components::keyboard_shortcut::KeyboardShortcut;
use galaxyui::ViewContext;
use galaxyui::{
elements::{
ChildAnchor, CornerRadius, Element, Hoverable, MouseStateHandle, OffsetPositioning,
ParentAnchor, ParentOffsetBounds, Stack,
},
AppContext, SingletonEntity,
};
use warpui::{Entity, TypedActionView, View, ViewHandle};
use galaxyui::{Entity, TypedActionView, View, ViewHandle};
use super::EditorElement;
@@ -310,7 +310,7 @@ impl View for AcceptAutosuggestionKeybinding {
let chevron_down = Container::new(
ConstrainedBox::new(
Icon::ArrowDropDown
.to_warpui_icon(Fill::Solid(font_color))
.to_galaxyui_icon(Fill::Solid(font_color))
.finish(),
)
.with_height(height_without_border)
app/src/editor/autosuggestion_ignore_view.rs
+10 -10
View File
@@ -4,15 +4,15 @@ use crate::appearance::Appearance;
use crate::ui_components::blended_colors;
use crate::ui_components::icons::Icon;
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::theme::Fill;
use warpui::elements::{
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::{
ChildAnchor, ConstrainedBox, Container, CornerRadius, Element, Hoverable, MouseStateHandle,
OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds, Radius, Stack,
};
use warpui::platform::Cursor;
use warpui::ui_components::components::UiComponent;
use warpui::{Entity, TypedActionView, View};
use warpui::{SingletonEntity, ViewContext};
use galaxyui::platform::Cursor;
use galaxyui::ui_components::components::UiComponent;
use galaxyui::{Entity, TypedActionView, View};
use galaxyui::{SingletonEntity, ViewContext};
use super::EditorElement;
@@ -77,7 +77,7 @@ impl View for AutosuggestionIgnore {
"AutosuggestionIgnore"
}
fn render(&self, ctx: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, ctx: &galaxyui::AppContext) -> Box<dyn Element> {
let appearance = Appearance::as_ref(ctx);
// Because the icon's origin is NOT the top of the line but the top of the cursor,
// we should render it with line height ratio no larger than DEFAULT_UI_LINE_HEIGHT_RATIO.
@@ -85,7 +85,7 @@ impl View for AutosuggestionIgnore {
// But we do need to account for smaller line height ratios so the text can be rendered in the smaller space.
let line_height_ratio = appearance
.line_height_ratio()
.min(warpui::elements::DEFAULT_UI_LINE_HEIGHT_RATIO);
.min(galaxyui::elements::DEFAULT_UI_LINE_HEIGHT_RATIO);
// We want the ignore icon to be the same height as the cursor in the input.
let height =
EditorElement::cursor_height(appearance.monospace_font_size(), line_height_ratio)
@@ -112,7 +112,7 @@ impl View for AutosuggestionIgnore {
let height_without_border = height - border_width * 2.;
let close_icon = Container::new(
ConstrainedBox::new(Icon::X.to_warpui_icon(Fill::Solid(icon_color)).finish())
ConstrainedBox::new(Icon::X.to_galaxyui_icon(Fill::Solid(icon_color)).finish())
.with_height(height_without_border)
.with_width(height_without_border)
.finish(),
@@ -122,7 +122,7 @@ impl View for AutosuggestionIgnore {
let mut ignore_button = Container::new(close_icon)
.with_uniform_padding(2.)
.with_border(
warpui::elements::Border::all(border_width).with_border_color(disabled_color),
galaxyui::elements::Border::all(border_width).with_border_color(disabled_color),
)
.with_corner_radius(CornerRadius::with_all(Radius::Percentage(25.)));
app/src/editor/mod.rs
+2 -2
View File
@@ -7,10 +7,10 @@ mod view;
/// They should _not_ be able to interface with the internal
/// details of the editor (e.g. the [`Buffer`]).
pub use view::*;
pub use warpui::text::point::Point;
pub use galaxyui::text::point::Point;
use std::{cmp, ops::Range};
use warpui::AppContext;
use galaxyui::AppContext;
pub fn init(app: &mut AppContext) {
view::init(app);
app/src/editor/soft_wrap.rs
+1 -1
View File
@@ -2,7 +2,7 @@ use anyhow::anyhow;
use parking_lot::Mutex;
use std::sync::Arc;
use warpui::text_layout;
use galaxyui::text_layout;
use crate::editor::{view::DisplayPoint, Point};
app/src/editor/view/element.rs
+15 -15
View File
@@ -23,16 +23,16 @@ use pathfinder_geometry::{
vector::{vec2f, Vector2F},
};
use vim::vim::{MotionType, VimMode};
use warp_core::features::FeatureFlag;
use warp_core::ui::appearance::DEFAULT_UI_FONT_SIZE;
use warp_util::user_input::UserInput;
use warpui::event::KeyState;
use warpui::text_selection_utils::{
use galaxy_core::features::FeatureFlag;
use galaxy_core::ui::appearance::DEFAULT_UI_FONT_SIZE;
use galaxy_util::user_input::UserInput;
use galaxyui::event::KeyState;
use galaxyui::text_selection_utils::{
calculate_tick_width, create_newline_tick_rect, selection_crosses_newline_row_based,
NewlineTickParams,
};
use warpui::ViewHandle;
use warpui::{event::ModifiersState, text_layout::ComputeBaselinePositionArgs};
use galaxyui::ViewHandle;
use galaxyui::{event::ModifiersState, text_layout::ComputeBaselinePositionArgs};
use crate::editor::view::AutosuggestionLocation;
use crate::themes::theme::Fill;
@@ -44,7 +44,7 @@ use std::{
sync::{Arc, Mutex},
time::Duration,
};
use warpui::{
use galaxyui::{
elements::{
AfterLayoutContext, CornerRadius, Element, Event, EventContext, LayoutContext,
PaintContext, Point, SizeConstraint,
@@ -56,13 +56,13 @@ use warpui::{
AppContext, SingletonEntity, TaskId,
};
use warpui::elements::{
use galaxyui::elements::{
ChildView, ConstrainedBox, Container, CrossAxisAlignment, Flex, ParentElement, Text,
};
use warpui::platform::keyboard::KeyCode;
use galaxyui::platform::keyboard::KeyCode;
use instant::Instant;
use warpui::elements::{Radius, DEFAULT_UI_LINE_HEIGHT_RATIO};
use galaxyui::elements::{Radius, DEFAULT_UI_LINE_HEIGHT_RATIO};
// Similar to the terminal::model::ansi::CursorShape, this Editor Element has different cursor
// shapes. However, this element doesn't implement all the same variants, so we don't share that
@@ -880,7 +880,7 @@ impl EditorElement {
cursor.origin.y() - cursor_height,
);
// New layer is started so avatars are rendered over text and prompt
ctx.scene.start_layer(warpui::ClipBounds::None);
ctx.scene.start_layer(galaxyui::ClipBounds::None);
drawable_selections_data
.avatar
.paint(avatar_origin, ctx, app);
@@ -896,7 +896,7 @@ impl EditorElement {
cursor.origin.y() - icon_size.y() - VOICE_INPUT_ICON_CURSOR_GAP,
);
// New layer is started so voice icon is rendered over text and prompt
ctx.scene.start_layer(warpui::ClipBounds::None);
ctx.scene.start_layer(galaxyui::ClipBounds::None);
element.paint(icon_origin, ctx, app);
ctx.scene.stop_layer();
}
@@ -1491,7 +1491,7 @@ impl EditorElement {
let cycle_next_command_hint = if self.should_show_cycle_next_command_hint(is_cycling, ctx) {
let appearance = Appearance::as_ref(ctx);
Some(
self.render_cycle_next_command_hint(warp_core::ui::theme::Fill::Solid(
self.render_cycle_next_command_hint(galaxy_core::ui::theme::Fill::Solid(
blended_colors::semantic_text_disabled(appearance.theme()),
)),
)
@@ -1511,7 +1511,7 @@ impl EditorElement {
.with_cross_axis_alignment(CrossAxisAlignment::End)
.with_children([
Container::new(
ConstrainedBox::new(Icon::ArrowDown.to_warpui_icon(color).finish())
ConstrainedBox::new(Icon::ArrowDown.to_galaxyui_icon(color).finish())
.with_max_height(icon_height)
.with_max_width(icon_height)
.finish(),
app/src/editor/view/marked_text_tests.rs
+2 -2
View File
@@ -1,6 +1,6 @@
use vim::vim::VimMode;
use warp_core::features::FeatureFlag;
use warpui::{keymap::Keystroke, platform::WindowStyle, App};
use galaxy_core::features::FeatureFlag;
use galaxyui::{keymap::Keystroke, platform::WindowStyle, App};
use crate::editor::{DisplayPoint, EditorOptions, EditorView};
app/src/editor/view/mod.rs
+30 -30
View File
@@ -38,12 +38,12 @@ use pathfinder_color::ColorU;
use settings::Setting as _;
use snapshot::{EditorHeightShrinkDelay, ViewSnapshot};
use vec1::{vec1, Vec1};
use warp_core::{safe_error, send_telemetry_from_ctx};
use warp_util::{path::ShellFamily, user_input::UserInput};
use warpui::platform::keyboard::KeyCode;
use warpui::ui_components::button::ButtonTooltipPosition;
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use warpui::{elements, ViewHandle};
use galaxy_core::{safe_error, send_telemetry_from_ctx};
use galaxy_util::{path::ShellFamily, user_input::UserInput};
use galaxyui::platform::keyboard::KeyCode;
use galaxyui::ui_components::button::ButtonTooltipPosition;
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use galaxyui::{elements, ViewHandle};
use crate::ai::agent::ImageContext;
use crate::ai::blocklist::{BlocklistAIContextModel, PendingAttachment, PendingFile};
@@ -97,7 +97,7 @@ use vim::{
vim_a_block, vim_a_paragraph, vim_a_quote, vim_a_word, vim_inner_block, vim_inner_paragraph,
vim_inner_quote, vim_inner_word, vim_word_iterator_from_offset,
};
use warp_core::semantic_selection::SemanticSelection;
use galaxy_core::semantic_selection::SemanticSelection;
use num_traits::SaturatingSub;
use parking_lot::Mutex;
@@ -114,31 +114,31 @@ use std::{
time::Duration,
};
use string_offset::{ByteOffset, CharOffset};
use warp_completer::completer::Description;
use warp_editor::editor::NavigationKey;
use warpui::actions::StandardAction;
use warpui::clipboard::ClipboardContent;
use warpui::elements::{
use galaxy_completer::completer::Description;
use galaxy_editor::editor::NavigationKey;
use galaxyui::actions::StandardAction;
use galaxyui::clipboard::ClipboardContent;
use galaxyui::elements::{
ChildView, Container, CornerRadius, CrossAxisAlignment, Flex, Hoverable, MainAxisSize,
ParentElement, Shrinkable, DEFAULT_UI_LINE_HEIGHT_RATIO,
};
use warpui::elements::{MouseStateHandle, Radius};
use warpui::fonts::{FamilyId, Properties, Weight};
use warpui::keymap::{Keystroke, PerPlatformKeystroke};
use warpui::platform::{Cursor, FilePickerConfiguration, OperatingSystem};
use warpui::r#async::{SpawnedFutureHandle, Timer};
use warpui::text::word_boundaries::WordBoundariesPolicy;
use warpui::text::TextBuffer;
use warpui::text_layout::TextStyle;
use warpui::windowing::WindowManager;
use warpui::{
use galaxyui::elements::{MouseStateHandle, Radius};
use galaxyui::fonts::{FamilyId, Properties, Weight};
use galaxyui::keymap::{Keystroke, PerPlatformKeystroke};
use galaxyui::platform::{Cursor, FilePickerConfiguration, OperatingSystem};
use galaxyui::r#async::{SpawnedFutureHandle, Timer};
use galaxyui::text::word_boundaries::WordBoundariesPolicy;
use galaxyui::text::TextBuffer;
use galaxyui::text_layout::TextStyle;
use galaxyui::windowing::WindowManager;
use galaxyui::{
accessibility::{AccessibilityContent, ActionAccessibilityContent, WarpA11yRole},
fonts::Cache as FontCache,
keymap::{EditableBinding, FixedBinding},
AppContext, Element, Entity, ModelAsRef, ModelHandle, View, ViewContext, WindowId,
};
use warpui::{windowing, BlurContext, EntityId, FocusContext};
use warpui::{CursorInfo, ModelContext, SingletonEntity, TypedActionView};
use galaxyui::{windowing, BlurContext, EntityId, FocusContext};
use galaxyui::{CursorInfo, ModelContext, SingletonEntity, TypedActionView};
const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
const DEFAULT_TAB_SIZE: usize = 4;
@@ -149,7 +149,7 @@ pub const VOICE_ERROR_TOAST_TEXT: &str = "An error occurred while processing you
pub const MAX_IMAGES_PER_CONVERSATION: usize = 200;
use warpui::clipboard_utils::CLIPBOARD_IMAGE_MIME_TYPES;
use galaxyui::clipboard_utils::CLIPBOARD_IMAGE_MIME_TYPES;
#[derive(Clone, Copy)]
pub enum AutosuggestionLocation {
@@ -191,7 +191,7 @@ pub const SELECT_UP_ACTION_NAME: &str = "editor_view:select_up";
pub const SELECT_DOWN_ACTION_NAME: &str = "editor_view:select_down";
pub fn init(ctx: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
ctx.register_fixed_bindings(vec![
// Below are default bindings that are similar to the behavior in all other text editors.
@@ -1383,7 +1383,7 @@ type RenderDecoratorElementsFn = Box<dyn Fn(&AppContext) -> EditorDecoratorEleme
/// Type alias for a closure that allows parent views to add flags to the EditorView's keymap context.
/// The closure takes the context by mutable reference and can insert additional flags.
pub type KeymapContextModifierFn = Box<dyn Fn(&mut warpui::keymap::Context, &AppContext)>;
pub type KeymapContextModifierFn = Box<dyn Fn(&mut galaxyui::keymap::Context, &AppContext)>;
/// Enum to choose between different methods of computing the baseline offset for text.
#[derive(Clone, Debug)]
@@ -7912,7 +7912,7 @@ impl EditorView {
// from the filesystem (the path transformer, if any, only applies to text insertion).
let paths_as_strings: Vec<String> = paths.iter().map(|path| path.to_string()).collect();
let image_filepaths =
warpui::clipboard_utils::get_image_filepaths_from_paths(&paths_as_strings);
galaxyui::clipboard_utils::get_image_filepaths_from_paths(&paths_as_strings);
// If we have image file paths, emit event for parent to handle terminal-specific processing
let num_image_files = image_filepaths.len();
@@ -7931,7 +7931,7 @@ impl EditorView {
};
let input =
warpui::clipboard_utils::escaped_paths_str(&transformed_paths, self.shell_family);
galaxyui::clipboard_utils::escaped_paths_str(&transformed_paths, self.shell_family);
self.user_insert(&input, ctx);
}
@@ -8667,7 +8667,7 @@ impl View for EditorView {
}
}
fn keymap_context(&self, ctx: &AppContext) -> warpui::keymap::Context {
fn keymap_context(&self, ctx: &AppContext) -> galaxyui::keymap::Context {
let mut context = Self::default_keymap_context();
if self.single_cursor_at_buffer_end(false /* respect_line_cap */, ctx) {
app/src/editor/view/mod_test.rs
+17 -17
View File
@@ -16,11 +16,11 @@ use itertools::Itertools;
use pathfinder_geometry::vector::vec2f;
use settings::ToggleableSetting;
use unindent::Unindent;
use warpui::color::ColorU;
use warpui::platform::WindowStyle;
use warpui::text_layout::TextFrame;
use warpui::windowing::WindowManager;
use warpui::{AddSingletonModel, App, UpdateModel, UpdateView};
use galaxyui::color::ColorU;
use galaxyui::platform::WindowStyle;
use galaxyui::text_layout::TextFrame;
use galaxyui::windowing::WindowManager;
use galaxyui::{AddSingletonModel, App, UpdateModel, UpdateView};
impl EditorView {
fn selected_ranges(&self, app: &AppContext) -> Vec<Range<DisplayPoint>> {
@@ -2038,7 +2038,7 @@ fn test_delete_and_cut_all_right() -> Result<()> {
#[test]
fn test_autosuggestions() -> Result<()> {
use warpui::text_layout::LayoutCache;
use galaxyui::text_layout::LayoutCache;
App::test((), |mut app| async move {
initialize_app(&mut app);
@@ -2316,7 +2316,7 @@ fn test_partial_autosuggestion() -> Result<()> {
#[test]
fn test_placeholder_text() {
use warpui::text_layout::LayoutCache;
use galaxyui::text_layout::LayoutCache;
App::test((), |mut app| async move {
initialize_app(&mut app);
@@ -4169,7 +4169,7 @@ fn test_paste_clipboard_with_text_only_should_paste_text_normally() {
// Text-only clipboard - should paste text normally
app.update(|ctx| {
let clipboard_content = warpui::clipboard::ClipboardContent {
let clipboard_content = galaxyui::clipboard::ClipboardContent {
plain_text: "hello world".to_string(),
paths: None,
html: None,
@@ -4185,7 +4185,7 @@ fn test_paste_clipboard_with_text_only_should_paste_text_normally() {
// Empty images array should also fall back to text paste
app.update(|ctx| {
let clipboard_content = warpui::clipboard::ClipboardContent {
let clipboard_content = galaxyui::clipboard::ClipboardContent {
plain_text: "fallback text".to_string(),
paths: None,
html: None,
@@ -4223,12 +4223,12 @@ fn test_paste_clipboard_with_image_only_should_switch_to_agent_mode() {
// Image-only clipboard - should switch to Agent Mode and attach image
app.update(|ctx| {
let png_image = warpui::clipboard::ImageData {
let png_image = galaxyui::clipboard::ImageData {
data: vec![137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13], // PNG header + minimal data
mime_type: "image/png".to_string(),
filename: None,
};
let clipboard_content = warpui::clipboard::ClipboardContent {
let clipboard_content = galaxyui::clipboard::ClipboardContent {
plain_text: "".to_string(), // No text
paths: None,
html: None,
@@ -4266,12 +4266,12 @@ fn test_paste_clipboard_with_supported_image_and_text_should_handle_both() {
// PNG (supported) image and text clipboard - should switch to Agent Mode, attach image, and paste text
app.update(|ctx| {
let png_image = warpui::clipboard::ImageData {
let png_image = galaxyui::clipboard::ImageData {
data: vec![137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13], // PNG header + minimal data
mime_type: "image/png".to_string(),
filename: Some("test.png".to_string()),
};
let clipboard_content = warpui::clipboard::ClipboardContent {
let clipboard_content = galaxyui::clipboard::ClipboardContent {
plain_text: "some descriptive text".to_string(),
paths: None,
html: None,
@@ -4310,12 +4310,12 @@ fn test_paste_clipboard_with_unsupported_image_and_text_should_show_error() {
// BMP (unsupported) image and text clipboard - should show error and paste text only
app.update(|ctx| {
let bmp_image = warpui::clipboard::ImageData {
let bmp_image = galaxyui::clipboard::ImageData {
data: vec![66, 77, 54, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0], // BMP header + minimal data
mime_type: "image/bmp".to_string(),
filename: Some("test.bmp".to_string()),
};
let clipboard_content = warpui::clipboard::ClipboardContent {
let clipboard_content = galaxyui::clipboard::ClipboardContent {
plain_text: "text with unsupported image".to_string(),
paths: None,
html: None,
@@ -4503,7 +4503,7 @@ fn test_drag_and_drop_files_applies_path_transformer() {
view.update(&mut app, |view, ctx| {
view.clear_buffer(ctx);
view.set_drag_drop_path_transformer(Some(Box::new(
warp_util::path::convert_windows_path_to_wsl,
galaxy_util::path::convert_windows_path_to_wsl,
)));
view.drag_and_drop_files(&paths(), ctx);
assert_eq!(view.buffer_text(ctx), "/mnt/c/foo/bar /mnt/d/baz ");
@@ -4512,7 +4512,7 @@ fn test_drag_and_drop_files_applies_path_transformer() {
view.update(&mut app, |view, ctx| {
view.clear_buffer(ctx);
view.set_drag_drop_path_transformer(Some(Box::new(
warp_util::path::convert_windows_path_to_msys2,
galaxy_util::path::convert_windows_path_to_msys2,
)));
view.drag_and_drop_files(&paths(), ctx);
assert_eq!(view.buffer_text(ctx), "/c/foo/bar /d/baz ");
app/src/editor/view/model/buffer/mod.rs
+10 -10
View File
@@ -42,10 +42,10 @@ use sum_tree::{self, Cursor, FilterCursor, SeekBias, SumTree};
use time::{Global, Lamport};
use undo::{LocalUndoStack, UndoHistory};
use vec1::{vec1, Vec1};
use warpui::color::ColorU;
use warpui::text::{point::Point, words::is_default_word_boundary, BufferIndex, TextBuffer};
use warpui::text_layout::TextStyle;
use warpui::{Entity, ModelContext};
use galaxyui::color::ColorU;
use galaxyui::text::{point::Point, words::is_default_word_boundary, BufferIndex, TextBuffer};
use galaxyui::text_layout::TextStyle;
use galaxyui::{Entity, ModelContext};
#[cfg(test)]
use rand::prelude::*;
@@ -365,9 +365,9 @@ impl TextStyleOperation {
///
/// # Example
/// ```
/// use warpui::color::ColorU;
/// use warpui::text_layout::TextStyle;
/// use warp::editor::TextStyleOperation;
/// use galaxyui::color::ColorU;
/// use galaxyui::text_layout::TextStyle;
/// use galaxy::editor::TextStyleOperation;
/// TextStyleOperation::apply_text_style_operation(
/// TextStyle::default(),
/// TextStyleOperation::default().set_error_underline_color(ColorU::black()),
@@ -1646,9 +1646,9 @@ impl Buffer {
///
/// # Example
/// ```ignore
/// use warpui::{color::ColorU, App, ModelHandle};
/// use warp::Assets;
/// use warp::editor::model::buffer::{Buffer, TextStyleOperation, EditOrigin};
/// use galaxyui::{color::ColorU, App, ModelHandle};
/// use galaxy::Assets;
/// use galaxy::editor::model::buffer::{Buffer, TextStyleOperation, EditOrigin};
/// use string_offset::CharOffset;
/// App::test((), |mut app| async move {
/// let buffer_model: &mut ModelHandle<Buffer> =
app/src/editor/view/model/buffer/mod_test.rs
+1 -1
View File
@@ -15,7 +15,7 @@ use std::{
collections::HashSet,
pin::{pin, Pin},
};
use warpui::{color::ColorU, App, ModelHandle};
use galaxyui::{color::ColorU, App, ModelHandle};
fn visible_text_styles(buffer: &Buffer) -> Vec<Option<TextStyle>> {
buffer
app/src/editor/view/model/buffer/subword_boundaries.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use super::{CharOffset, Point};
use itertools::Either;
use std::iter::Peekable;
use warpui::text::{
use galaxyui::text::{
word_boundaries::WordBoundariesApproach, words::is_subword_boundary_char, TextBuffer,
};
app/src/editor/view/model/buffer/subword_boundaries_tests.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use super::super::Buffer;
use warpui::text::point::Point;
use galaxyui::text::point::Point;
#[test]
fn test_subword_boundaries_forward_starts() {
app/src/editor/view/model/buffer/text.rs
+2 -2
View File
@@ -8,8 +8,8 @@ use std::{
};
use string_offset::{ByteOffset, CharOffset};
use sum_tree::{self, SeekBias, SumTree};
use warpui::text::point::Point;
use warpui::text_layout::TextStyle;
use galaxyui::text::point::Point;
use galaxyui::text_layout::TextStyle;
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
enum Run {
app/src/editor/view/model/display_map/fold_map.rs
+2 -2
View File
@@ -10,8 +10,8 @@ use std::{
};
use string_offset::CharOffset;
use sum_tree::{self, Cursor, Dimension, SeekBias, SumTree};
use warpui::text_layout::TextStyle;
use warpui::{AppContext, ModelHandle};
use galaxyui::text_layout::TextStyle;
use galaxyui::{AppContext, ModelHandle};
pub struct FoldMap {
buffer: ModelHandle<Buffer>,
app/src/editor/view/model/display_map/fold_map_test.rs
+1 -1
View File
@@ -2,7 +2,7 @@ use super::*;
use crate::editor::tests::{sample_text, RandomCharIter};
use crate::editor::EditOrigin;
use tests::buffer::RangesWhenEditing;
use warpui::App;
use galaxyui::App;
#[test]
fn test_basic_folds() -> Result<()> {
app/src/editor/view/model/display_map/mod.rs
+2 -2
View File
@@ -8,8 +8,8 @@ use fold_map::FoldMap;
use std::cmp;
use std::ops::Range;
use string_offset::CharOffset;
use warpui::text::point::Point;
use warpui::{AppContext, Entity, ModelContext, ModelHandle};
use galaxyui::text::point::Point;
use galaxyui::{AppContext, Entity, ModelContext, ModelHandle};
#[derive(Copy, Clone)]
pub enum Bias {
app/src/editor/view/model/display_map/mod_test.rs
+1 -1
View File
@@ -3,7 +3,7 @@ use crate::editor::tests::sample_text;
use super::*;
use crate::editor::EditOrigin;
use anyhow::Error;
use warpui::App;
use galaxyui::App;
#[test]
fn test_chars_at() -> Result<()> {
app/src/editor/view/model/mod.rs
+2 -2
View File
@@ -29,12 +29,12 @@ use std::{
use num_traits::SaturatingSub;
use string_offset::{ByteOffset, CharOffset};
use vec1::{vec1, Vec1};
use warpui::{
use galaxyui::{
accessibility::{AccessibilityContent, WarpA11yRole},
text_layout::TextStyle,
AppContext, Entity, ModelAsRef, ModelContext, ModelHandle,
};
use warpui::{
use galaxyui::{
text::{point::Point, word_boundaries::WordBoundariesPolicy, TextBuffer},
SingletonEntity,
};
app/src/editor/view/model/mod_test.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use string_offset::{ByteOffset, CharOffset};
use warpui::{text_layout::TextStyle, App};
use galaxyui::{text_layout::TextStyle, App};
use crate::editor::{EditorSnapshot, PlainTextEditorViewAction, TextRun, ValidInputType};
app/src/editor/view/model/selections.rs
+2 -2
View File
@@ -4,8 +4,8 @@ use pathfinder_geometry::vector::Vector2F;
use serde::{Deserialize, Serialize};
use string_offset::{ByteOffset, CharOffset};
use vec1::Vec1;
use warpui::text::point::Point;
use warpui::AppContext;
use galaxyui::text::point::Point;
use galaxyui::AppContext;
use super::{
buffer::{Anchor, Buffer, LamportValue, ToBufferOffset, ToCharOffset, ToPoint},
app/src/editor/view/movement.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use super::{DisplayMap, DisplayPoint};
use anyhow::Result;
use warpui::AppContext;
use galaxyui::AppContext;
pub fn left(
map: &DisplayMap,
app/src/editor/view/snapshot.rs
+7 -7
View File
@@ -26,19 +26,19 @@ use std::{
ops::Range,
sync::Arc,
};
use warp_completer::completer::Description;
use warpui::text::point::Point;
use galaxy_completer::completer::Description;
use galaxyui::text::point::Point;
use string_offset::ByteOffset;
use warpui::fonts::{FamilyId, Properties};
use warpui::platform::LineStyle;
use warpui::text_layout::{
use galaxyui::fonts::{FamilyId, Properties};
use galaxyui::platform::LineStyle;
use galaxyui::text_layout::{
default_compute_baseline_position_fn, ClipConfig, ComputeBaselinePositionFn, StyleAndFont,
TextAlignment, TextStyle, DEFAULT_TOP_BOTTOM_RATIO,
};
use warpui::EntityId;
use warpui::{
use galaxyui::EntityId;
use galaxyui::{
fonts::Cache as FontCache,
text_layout::{self, LayoutCache},
AppContext, ModelHandle,
app/src/editor/view/vim_handler_test.rs
+12 -12
View File
@@ -3,8 +3,8 @@ use crate::editor::EditorView;
use itertools::Itertools;
use std::collections::HashSet;
use unindent::Unindent;
use warpui::platform::WindowStyle;
use warpui::{App, ViewHandle};
use galaxyui::platform::WindowStyle;
use galaxyui::{App, ViewHandle};
/// Helper function for testing vim mode commands.
/// This creates an editor with the given content and enters Vim Normal mode,
@@ -294,11 +294,11 @@ fn test_vim_number_repeat_line_motion() {
// Lay out the window so that up and down motions work.
// Layout code starts here.
let window_id = app.read(|ctx| editor.window_id(ctx));
let mut presenter = warpui::presenter::Presenter::new(window_id);
let mut presenter = galaxyui::presenter::Presenter::new(window_id);
let mut updated = HashSet::new();
updated.insert(app.root_view_id(window_id).unwrap());
let invalidation = warpui::WindowInvalidation {
let invalidation = galaxyui::WindowInvalidation {
updated,
..Default::default()
};
@@ -374,11 +374,11 @@ fn test_vim_number_repeat_character_motion() {
// Lay out the window so that up and down motions work.
// Layout code starts here.
let window_id = app.read(|ctx| editor.window_id(ctx));
let mut presenter = warpui::presenter::Presenter::new(window_id);
let mut presenter = galaxyui::presenter::Presenter::new(window_id);
let mut updated = HashSet::new();
updated.insert(app.root_view_id(window_id).unwrap());
let invalidation = warpui::WindowInvalidation {
let invalidation = galaxyui::WindowInvalidation {
updated,
..Default::default()
};
@@ -2393,11 +2393,11 @@ fn test_vim_begin_line_above() {
// Lay out the window so that up and down motions work.
// Layout code starts here.
let window_id = app.read(|ctx| editor.window_id(ctx));
let mut presenter = warpui::presenter::Presenter::new(window_id);
let mut presenter = galaxyui::presenter::Presenter::new(window_id);
let mut updated = HashSet::new();
updated.insert(app.root_view_id(window_id).unwrap());
let invalidation = warpui::WindowInvalidation {
let invalidation = galaxyui::WindowInvalidation {
updated,
..Default::default()
};
@@ -7624,10 +7624,10 @@ fn test_vim_visual_selection_with_newlines() {
// Ensure layout so vertical motions (j/k) use real geometry for goal columns.
let window_id = app.read(|ctx| editor.window_id(ctx));
let mut presenter = warpui::presenter::Presenter::new(window_id);
let mut presenter = galaxyui::presenter::Presenter::new(window_id);
let mut updated = std::collections::HashSet::new();
updated.insert(app.root_view_id(window_id).unwrap());
let invalidation = warpui::WindowInvalidation {
let invalidation = galaxyui::WindowInvalidation {
updated,
..Default::default()
};
@@ -7672,10 +7672,10 @@ fn test_vim_visual_selection_with_newlines() {
// Re-layout for new content
let window_id = app.read(|ctx| editor.window_id(ctx));
let mut presenter = warpui::presenter::Presenter::new(window_id);
let mut presenter = galaxyui::presenter::Presenter::new(window_id);
let mut updated = std::collections::HashSet::new();
updated.insert(app.root_view_id(window_id).unwrap());
let invalidation = warpui::WindowInvalidation {
let invalidation = galaxyui::WindowInvalidation {
updated,
..Default::default()
};
app/src/editor/view/voice.rs
+17 -17
View File
@@ -13,17 +13,17 @@ use crate::workspace::ToastStack;
use crate::workspaces::user_workspaces::UserWorkspaces;
use settings::Setting as _;
use voice_input::{StartListeningError, VoiceInput, VoiceSessionResult};
use warp_core::send_telemetry_from_ctx;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::AnsiColorIdentifier;
use warpui::elements;
use warpui::elements::{Container, CornerRadius, Icon, Radius};
use warpui::platform::Cursor;
use warpui::r#async::SpawnedFutureHandle;
use warpui::ui_components::button::ButtonTooltipPosition;
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use warpui::ViewHandle;
use warpui::{AppContext, Element, SingletonEntity, ViewContext};
use galaxy_core::send_telemetry_from_ctx;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::AnsiColorIdentifier;
use galaxyui::elements;
use galaxyui::elements::{Container, CornerRadius, Icon, Radius};
use galaxyui::platform::Cursor;
use galaxyui::r#async::SpawnedFutureHandle;
use galaxyui::ui_components::button::ButtonTooltipPosition;
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use galaxyui::ViewHandle;
use galaxyui::{AppContext, Element, SingletonEntity, ViewContext};
use super::VoiceTranscriber;
@@ -82,7 +82,7 @@ impl EditorView {
crate::view_components::NewFeaturePopupEvent::Dismissed
) {
AISettings::handle(ctx).update(ctx, |settings, ctx| {
warp_core::report_if_error!(settings
galaxy_core::report_if_error!(settings
.dismissed_voice_input_new_feature_popup
.set_value(true, ctx));
});
@@ -238,7 +238,7 @@ impl EditorView {
// For example, the user could press Fn in a different app, then switch focus
// to Warp and let it go - we should NOT activate voice input in this case.
VoiceInputState::Stopped => {
if matches!(state, warpui::event::KeyState::Released) {
if matches!(state, galaxyui::event::KeyState::Released) {
return false;
}
}
@@ -247,7 +247,7 @@ impl EditorView {
// key events). Thus, the user cannot enter a state where we're listening for voice input
// but the key is not held already.
VoiceInputState::Listening => {
if matches!(state, warpui::event::KeyState::Pressed) {
if matches!(state, galaxyui::event::KeyState::Pressed) {
return false;
}
}
@@ -526,8 +526,8 @@ impl EditorView {
let microphone_access_state = app.microphone_access_state();
let mic_access_denied = matches!(
microphone_access_state,
warpui::platform::MicrophoneAccessState::Restricted
| warpui::platform::MicrophoneAccessState::Denied
galaxyui::platform::MicrophoneAccessState::Restricted
| galaxyui::platform::MicrophoneAccessState::Denied
);
let modifier_key = AISettings::handle(app).as_ref(app).voice_input_toggle_key;
@@ -606,7 +606,7 @@ impl EditorView {
button = button.disabled();
}
warpui::elements::SavePosition::new(
galaxyui::elements::SavePosition::new(
button
.build()
.on_click(move |ctx, _, _| {