Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -5,8 +5,8 @@
|
||||
use async_trait::async_trait;
|
||||
use ipc::ServiceCaller;
|
||||
use std::sync::Arc;
|
||||
use warp_completer::completer::{JsExecutionContext, JsExecutionError};
|
||||
use warp_js::{JsFunctionId, SerializedJsValue};
|
||||
use galaxy_completer::completer::{JsExecutionContext, JsExecutionError};
|
||||
use galaxy_js::{JsFunctionId, SerializedJsValue};
|
||||
|
||||
use crate::plugin::service::{
|
||||
CallJsFunctionRequest, CallJsFunctionResponse, CallJsFunctionService,
|
||||
|
||||
@@ -11,14 +11,14 @@ use async_trait::async_trait;
|
||||
use lazy_static::lazy_static;
|
||||
use smol_str::SmolStr;
|
||||
use typed_path::{TypedPath, TypedPathBuf};
|
||||
use warp_completer::completer::{
|
||||
use galaxy_completer::completer::{
|
||||
CommandExitStatus, CommandOutput, CompletionContext, EngineDirEntry, EngineFileType,
|
||||
GeneratorContext, PathCompletionContext, PathSeparators, TopLevelCommandCaseSensitivity,
|
||||
};
|
||||
use warp_completer::signatures::CommandRegistry;
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_util::path::{EscapeChar, ShellFamily};
|
||||
use warpui::{AppContext, SingletonEntity};
|
||||
use galaxy_completer::signatures::CommandRegistry;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_util::path::{EscapeChar, ShellFamily};
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
|
||||
use crate::safe_warn;
|
||||
use crate::terminal::model::session::{ExecuteCommandOptions, Session, SessionType};
|
||||
@@ -320,10 +320,10 @@ impl CompletionContext for SessionContext {
|
||||
}
|
||||
|
||||
#[cfg(feature = "completions_v2")]
|
||||
fn js_context(&self) -> Option<&dyn warp_completer::completer::JsExecutionContext> {
|
||||
fn js_context(&self) -> Option<&dyn galaxy_completer::completer::JsExecutionContext> {
|
||||
self.js_ctx
|
||||
.as_ref()
|
||||
.map(|ctx| -> &dyn warp_completer::completer::JsExecutionContext { ctx })
|
||||
.map(|ctx| -> &dyn galaxy_completer::completer::JsExecutionContext { ctx })
|
||||
}
|
||||
|
||||
fn shell_family(&self) -> Option<ShellFamily> {
|
||||
@@ -459,7 +459,7 @@ fn ls_script_for_dir(directory: &TypedPath) -> Option<String> {
|
||||
log::warn!("Non-unicode character found in path: `{directory:?}`");
|
||||
return None;
|
||||
};
|
||||
let escaped_dir = warp_util::path::ShellFamily::Posix.shell_escape(dir_str);
|
||||
let escaped_dir = galaxy_util::path::ShellFamily::Posix.shell_escape(dir_str);
|
||||
|
||||
// Get all directories with -print0, which makes all items end in `\0` (null character)
|
||||
// Get all files with -print0, which makes all items end in `\0`
|
||||
|
||||
+10
-10
@@ -6,10 +6,10 @@ use itertools::Itertools;
|
||||
use typed_path::TypedPathBuf;
|
||||
#[cfg(windows)]
|
||||
use typed_path::{UnixComponent, WindowsComponent, WindowsPrefix};
|
||||
use warp_completer::completer::PathCompletionContext;
|
||||
use warp_completer::completer::{CompletionContext, EngineDirEntry};
|
||||
use warp_completer::signatures::CommandRegistry;
|
||||
use warpui::App;
|
||||
use galaxy_completer::completer::PathCompletionContext;
|
||||
use galaxy_completer::completer::{CompletionContext, EngineDirEntry};
|
||||
use galaxy_completer::signatures::CommandRegistry;
|
||||
use galaxyui::App;
|
||||
|
||||
use crate::completer::SessionContext;
|
||||
use crate::terminal::model::session::Session;
|
||||
@@ -120,7 +120,7 @@ pub fn test_session_context_top_level_commands_includes_external_commands() {
|
||||
SessionInfo::new_for_test(),
|
||||
Arc::new(TestCommandExecutor::default()),
|
||||
);
|
||||
warpui::r#async::block_on(session.load_external_commands());
|
||||
galaxyui::r#async::block_on(session.load_external_commands());
|
||||
|
||||
let ctx = test_session_context(session, working_directory(), &app);
|
||||
|
||||
@@ -160,7 +160,7 @@ pub fn test_session_context_lists_directory_entries_locally() {
|
||||
sandbox.touch(vec![
|
||||
Stub::EmptyFile("Cargo.toml"),
|
||||
Stub::EmptyFile("src/app/mod.rs"),
|
||||
Stub::EmptyFile("target/debug/warpui"),
|
||||
Stub::EmptyFile("target/debug/galaxyui"),
|
||||
]);
|
||||
|
||||
let tests_dir = TypedPathBuf::from(dirs.tests().to_string_lossy().as_bytes());
|
||||
@@ -172,7 +172,7 @@ pub fn test_session_context_lists_directory_entries_locally() {
|
||||
|
||||
assert_eq!(
|
||||
HashSet::<EngineDirEntry>::from_iter(Arc::unwrap_or_clone(
|
||||
warpui::r#async::block_on(ctx.list_directory_entries(tests_dir))
|
||||
galaxyui::r#async::block_on(ctx.list_directory_entries(tests_dir))
|
||||
)),
|
||||
HashSet::from_iter([
|
||||
EngineDirEntry::test_dir(".hidden"),
|
||||
@@ -235,7 +235,7 @@ pub fn test_session_context_lists_directory_entries_remotely() {
|
||||
Stub::EmptyFile("control_path.socket"),
|
||||
Stub::EmptyFile("Cargo.toml"),
|
||||
Stub::EmptyFile("src/app/mod.rs"),
|
||||
Stub::EmptyFile("target/debug/warpui"),
|
||||
Stub::EmptyFile("target/debug/galaxyui"),
|
||||
]);
|
||||
|
||||
let cwd = TypedPathBuf::from(dirs.tests().to_string_lossy().as_bytes());
|
||||
@@ -256,7 +256,7 @@ pub fn test_session_context_lists_directory_entries_remotely() {
|
||||
let ctx = test_session_context(Session::test_remote(), cwd.clone(), &app);
|
||||
|
||||
let mut entries = HashSet::<EngineDirEntry>::from_iter(Arc::unwrap_or_clone(
|
||||
warpui::r#async::block_on(ctx.list_directory_entries(cwd)),
|
||||
galaxyui::r#async::block_on(ctx.list_directory_entries(cwd)),
|
||||
));
|
||||
// TODO(CORE-2000): The ls script we use to list entries in remote
|
||||
// sessions adds a spurious "." directory when run in the VirtualFS.
|
||||
@@ -322,7 +322,7 @@ fn perform_special_characters_in_path_test(session: Session, file_names: Vec<&st
|
||||
let ctx = test_session_context(session, test_dir.clone(), &app);
|
||||
|
||||
let mut entries = HashSet::<EngineDirEntry>::from_iter(Arc::unwrap_or_clone(
|
||||
warpui::r#async::block_on(ctx.list_directory_entries(test_dir)),
|
||||
galaxyui::r#async::block_on(ctx.list_directory_entries(test_dir)),
|
||||
));
|
||||
// TODO(CORE-2000): The ls script we use to list entries in remote
|
||||
// sessions adds a spurious "." directory when run in the VirtualFS.
|
||||
|
||||
Reference in New Issue
Block a user