first pass of merging in warp (doesn't build)
This commit is contained in:
@@ -1,15 +1,12 @@
|
||||
use std::path::PathBuf;
|
||||
|
||||
use crate::{
|
||||
app_state::{
|
||||
AppState, BranchSnapshot, LeafContents, LeafSnapshot, NotebookPaneSnapshot, PaneFlex,
|
||||
PaneNodeSnapshot, SplitDirection, TabSnapshot, TerminalPaneSnapshot, WindowSnapshot,
|
||||
},
|
||||
drive::OpenGalaxyDriveObjectSettings,
|
||||
tab::SelectedTabColor,
|
||||
};
|
||||
|
||||
use super::{LaunchConfig, PaneMode, PaneTemplateType};
|
||||
use crate::app_state::{
|
||||
AppState, BranchSnapshot, LeafContents, LeafSnapshot, NotebookPaneSnapshot, PaneFlex,
|
||||
PaneNodeSnapshot, SplitDirection, TabSnapshot, TerminalPaneSnapshot, WindowSnapshot,
|
||||
};
|
||||
use crate::drive::OpenWarpDriveObjectSettings;
|
||||
use crate::tab::SelectedTabColor;
|
||||
|
||||
fn single_tab_snapshot(root: PaneNodeSnapshot) -> AppState {
|
||||
AppState {
|
||||
@@ -21,6 +18,8 @@ fn single_tab_snapshot(root: PaneNodeSnapshot) -> AppState {
|
||||
root,
|
||||
left_panel: None,
|
||||
right_panel: None,
|
||||
group_id: None,
|
||||
pinned: false,
|
||||
}],
|
||||
active_tab_index: 0,
|
||||
bounds: None,
|
||||
@@ -35,6 +34,7 @@ fn single_tab_snapshot(root: PaneNodeSnapshot) -> AppState {
|
||||
left_panel_width: None,
|
||||
right_panel_width: None,
|
||||
agent_management_filters: None,
|
||||
tab_groups: vec![],
|
||||
}],
|
||||
active_window_index: Some(0),
|
||||
block_lists: Default::default(),
|
||||
@@ -59,6 +59,7 @@ fn multi_tab_snapshot(active_tab_index: usize, tabs: Vec<TabSnapshot>) -> AppSta
|
||||
left_panel_width: None,
|
||||
right_panel_width: None,
|
||||
agent_management_filters: None,
|
||||
tab_groups: vec![],
|
||||
}],
|
||||
active_window_index: Some(0),
|
||||
block_lists: Default::default(),
|
||||
@@ -257,7 +258,9 @@ fn test_config_with_active_tab_index() {
|
||||
)],
|
||||
}),
|
||||
left_panel: None,
|
||||
right_panel: None
|
||||
right_panel: None,
|
||||
group_id: None,
|
||||
pinned: false,
|
||||
};
|
||||
3
|
||||
],
|
||||
@@ -292,6 +295,8 @@ fn test_config_with_active_tab_index_and_filtered_tabs() {
|
||||
}),
|
||||
left_panel: None,
|
||||
right_panel: None,
|
||||
group_id: None,
|
||||
pinned: false,
|
||||
},
|
||||
TabSnapshot {
|
||||
custom_title: None,
|
||||
@@ -321,6 +326,8 @@ fn test_config_with_active_tab_index_and_filtered_tabs() {
|
||||
}),
|
||||
left_panel: None,
|
||||
right_panel: None,
|
||||
group_id: None,
|
||||
pinned: false,
|
||||
},
|
||||
],
|
||||
);
|
||||
@@ -362,6 +369,8 @@ fn test_config_with_active_tab_being_filtered() {
|
||||
}),
|
||||
left_panel: None,
|
||||
right_panel: None,
|
||||
group_id: None,
|
||||
pinned: false,
|
||||
},
|
||||
TabSnapshot {
|
||||
custom_title: None,
|
||||
@@ -383,6 +392,8 @@ fn test_config_with_active_tab_being_filtered() {
|
||||
}),
|
||||
left_panel: None,
|
||||
right_panel: None,
|
||||
group_id: None,
|
||||
pinned: false,
|
||||
},
|
||||
],
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user