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

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
+13 -17
View File
@@ -1,21 +1,17 @@
use galaxyui::{
modals::{AlertDialogWithCallbacks, AppModalCallback, ModalButton},
AppContext, EntityId, SingletonEntity, ViewContext, WeakViewHandle, WindowId,
};
use itertools::Itertools;
use settings::ToggleableSetting as _;
use std::fmt::Write;
use crate::{
code::editor_management::{CodeEditorStatus, CodeEditorSummary},
pane_group::{CodePane, PaneGroup, PaneId, TerminalPane},
report_if_error, send_telemetry_from_app_ctx,
server::telemetry::CloseTarget,
session_management::{RunningSessionSummary, SessionNavigationData},
terminal::general_settings::GeneralSettings,
workspace::Workspace,
TelemetryEvent,
};
use itertools::Itertools;
use settings::ToggleableSetting as _;
use galaxyui::modals::{AlertDialogWithCallbacks, AppModalCallback, ModalButton};
use galaxyui::{AppContext, EntityId, SingletonEntity, ViewContext, WeakViewHandle, WindowId};
use crate::code::editor_management::{CodeEditorStatus, CodeEditorSummary};
use crate::pane_group::{CodePane, PaneGroup, PaneId, TerminalPane};
use crate::server::telemetry::CloseTarget;
use crate::session_management::{RunningSessionSummary, SessionNavigationData};
use crate::terminal::general_settings::GeneralSettings;
use crate::workspace::Workspace;
use crate::{report_if_error, send_telemetry_from_app_ctx, TelemetryEvent};
/// Scope of what's being quit/closed.
#[derive(Clone)]
@@ -468,7 +464,7 @@ impl<'a> QuitWarningDialog<'a> {
shown = true;
} else if cfg!(all(
not(target_family = "wasm"),
any(target_os = "linux", windows)
any(target_os = "linux", target_os = "freebsd", windows)
)) {
// Find a window to show the Warp-native modal in. If there is no active window, use
// one of the windows with a running process.