Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
+16
-16
@@ -249,9 +249,9 @@ use std::{
|
||||
use string_offset::CharOffset;
|
||||
use vec1::Vec1;
|
||||
use vim::vim::{VimHandler, VimMode};
|
||||
use warp_completer::util::parse_current_commands_and_tokens;
|
||||
use galaxy_completer::util::parse_current_commands_and_tokens;
|
||||
|
||||
use warp_completer::{
|
||||
use galaxy_completer::{
|
||||
completer::{
|
||||
self, CompleterOptions, CompletionContext, CompletionsFallbackStrategy, Description, Match,
|
||||
MatchStrategy, MatchType, PathSeparators, SuggestionResults,
|
||||
@@ -260,14 +260,14 @@ use warp_completer::{
|
||||
parsers::{simple::command_at_cursor_position, LiteCommand},
|
||||
signatures::CommandRegistry,
|
||||
};
|
||||
use warp_core::user_preferences::GetUserPreferences as _;
|
||||
use warp_core::{
|
||||
use galaxy_core::user_preferences::GetUserPreferences as _;
|
||||
use galaxy_core::{
|
||||
context_flag::ContextFlag,
|
||||
ui::theme::{color::internal_colors, AnsiColorIdentifier},
|
||||
};
|
||||
use warp_editor::editor::NavigationKey;
|
||||
use warp_util::path::ShellFamily;
|
||||
use warpui::{
|
||||
use galaxy_editor::editor::NavigationKey;
|
||||
use galaxy_util::path::ShellFamily;
|
||||
use galaxyui::{
|
||||
accessibility::{AccessibilityContent, ActionAccessibilityContent, WarpA11yRole},
|
||||
clipboard::{ClipboardContent, ImageData},
|
||||
clipboard_utils::CLIPBOARD_IMAGE_MIME_TYPES,
|
||||
@@ -295,7 +295,7 @@ use warpui::{
|
||||
AppContext, Entity, EntityId, FocusContext, ModelAsRef, ModelHandle, SingletonEntity,
|
||||
TypedActionView, View, ViewContext, ViewHandle, WeakViewHandle,
|
||||
};
|
||||
pub use warpui::{
|
||||
pub use galaxyui::{
|
||||
elements::{ParentElement as _, Stack},
|
||||
geometry::vector::{vec2f, Vector2F},
|
||||
WindowId,
|
||||
@@ -1728,7 +1728,7 @@ impl DeferredRemoteOperations {
|
||||
}
|
||||
|
||||
pub fn init(app: &mut AppContext) {
|
||||
use warpui::keymap::macros::*;
|
||||
use galaxyui::keymap::macros::*;
|
||||
|
||||
if cfg!(feature = "integration_tests") {
|
||||
app.register_fixed_bindings([
|
||||
@@ -8984,7 +8984,7 @@ impl Input {
|
||||
// the completions finish quickly, since that causes a jittery UX.
|
||||
let _ = ctx.spawn(
|
||||
async move {
|
||||
warpui::r#async::Timer::after(Duration::from_millis(750)).await;
|
||||
galaxyui::r#async::Timer::after(Duration::from_millis(750)).await;
|
||||
old_buffer_text_original
|
||||
},
|
||||
move |input, old_buffer_text_original, ctx| {
|
||||
@@ -9603,7 +9603,7 @@ impl Input {
|
||||
.map(|session| session.is_wsl())
|
||||
.unwrap_or(false);
|
||||
|
||||
let relative_path = warp_util::path::to_relative_path(
|
||||
let relative_path = galaxy_util::path::to_relative_path(
|
||||
is_wsl,
|
||||
&absolute_path,
|
||||
Path::new(pwd),
|
||||
@@ -9680,7 +9680,7 @@ impl Input {
|
||||
None => image_filepaths.clone(),
|
||||
};
|
||||
let paths_str =
|
||||
warpui::clipboard_utils::escaped_paths_str(&transformed, shell_family);
|
||||
galaxyui::clipboard_utils::escaped_paths_str(&transformed, shell_family);
|
||||
|
||||
self.editor.update(ctx, |editor, ctx| {
|
||||
editor.user_insert(&paths_str, ctx);
|
||||
@@ -9726,7 +9726,7 @@ impl Input {
|
||||
|
||||
// Check if we should insert clipboard text in advance
|
||||
let mut already_inserted_text = false;
|
||||
if warpui::clipboard::should_insert_text_on_paste(&content) {
|
||||
if galaxyui::clipboard::should_insert_text_on_paste(&content) {
|
||||
self.insert_clipboard_text_content(ctx, content.clone());
|
||||
already_inserted_text = true;
|
||||
}
|
||||
@@ -9738,7 +9738,7 @@ impl Input {
|
||||
self.handle_pasted_image_data(content.clone(), ctx) == 0
|
||||
} else if content.num_paths() > 0 {
|
||||
// Else, we check the pasted file paths for any images.
|
||||
let image_filepaths = warpui::clipboard_utils::get_image_filepaths_from_paths(
|
||||
let image_filepaths = galaxyui::clipboard_utils::get_image_filepaths_from_paths(
|
||||
content.paths.as_deref().unwrap_or(&[]),
|
||||
);
|
||||
let num_images_expected = image_filepaths.len();
|
||||
@@ -13623,7 +13623,7 @@ impl Input {
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.with_icon(icon.to_warpui_icon(
|
||||
.with_icon(icon.to_galaxyui_icon(
|
||||
blended_colors::text_main(appearance.theme(), appearance.theme().background()).into(),
|
||||
))
|
||||
.with_close_button(close_button)
|
||||
@@ -14108,7 +14108,7 @@ impl View for Input {
|
||||
}
|
||||
}
|
||||
|
||||
fn keymap_context(&self, app: &AppContext) -> warpui::keymap::Context {
|
||||
fn keymap_context(&self, app: &AppContext) -> galaxyui::keymap::Context {
|
||||
let mut ctx = Self::default_keymap_context();
|
||||
let ai_settings = AISettings::as_ref(app);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user