first pass of merging in warp (doesn't build)

2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
@@ -1,29 +1,20 @@
-use itertools::Itertools as _;
-use std::fs::OpenOptions;
+use std::fs::{create_dir_all, write, OpenOptions};
 use std::io::Write;
-use std::path::PathBuf;
-use std::{
-    fs::{create_dir_all, write},
-    path::Path,
-};
+use std::path::{Path, PathBuf};
+
+use itertools::Itertools as _;
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
-
 use version_compare::Version;
+use warp::integration_testing::terminal::util::{
+    current_shell_starter_and_version, default_histfile_directory, ExpectedOutput,
+};
+use warp::integration_testing::view_getters;
+use warp::terminal::shell;
+use warp::terminal::shell::ShellType;
+use galaxyui_core::{App, WindowId};

 use crate::builder::cargo_target_tmpdir;
-use galaxy::{
-    integration_testing::{
-        terminal::util::{
-            current_shell_starter_and_version, default_histfile_directory, ExpectedOutput,
-        },
-        view_getters,
-    },
-    terminal::shell::ShellType,
-};
-use galaxyui::{App, WindowId};
-
-use galaxy::terminal::shell;

 pub fn get_input_buffer(
    app: &App,