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

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
+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 {