Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP fixing dock problems

Browse source
This commit is contained in:
Mikayla Maki 2022-12-02 14:30:26 -08:00
parent 5262e8c77e
commit ffcad4e4e2
12 changed files with 234 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/workspace/src/persistence.rs
View file

@ -27,7 +27,7 @@ define_connection! {
dock_visible INTEGER, // Boolean
dock_anchor TEXT, // Enum: 'Bottom' / 'Right' / 'Expanded'
dock_pane INTEGER, // NULL indicates that we don't have a dock pane yet
project_panel_open INTEGER, //Boolean
left_sidebar_open INTEGER, //Boolean
timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
FOREIGN KEY(dock_pane) REFERENCES panes(pane_id)
) STRICT;
@ -91,7 +91,7 @@ impl WorkspaceDb {
// Note that we re-assign the workspace_id here in case it's empty
// and we've grabbed the most recent workspace
let (workspace_id, workspace_location, project_panel_open, dock_position): (
let (workspace_id, workspace_location, left_sidebar_open, dock_position): (
WorkspaceId,
WorkspaceLocation,
bool,
@ -99,12 +99,12 @@ impl WorkspaceDb {
) = iife!({
if worktree_roots.len() == 0 {
self.select_row(sql!(
SELECT workspace_id, workspace_location, project_panel_open, dock_visible, dock_anchor
SELECT workspace_id, workspace_location, left_sidebar_open, dock_visible, dock_anchor
FROM workspaces
ORDER BY timestamp DESC LIMIT 1))?()?
} else {
self.select_row_bound(sql!(
SELECT workspace_id, workspace_location, project_panel_open, dock_visible, dock_anchor
SELECT workspace_id, workspace_location, left_sidebar_open, dock_visible, dock_anchor
FROM workspaces
WHERE workspace_location = ?))?(&workspace_location)?
}
@ -125,7 +125,7 @@ impl WorkspaceDb {
.context("Getting center group")
.log_err()?,
dock_position,
project_panel_open
left_sidebar_open
})
}
@ -151,7 +151,7 @@ impl WorkspaceDb {
INSERT INTO workspaces(
workspace_id,
workspace_location,
project_panel_open,
left_sidebar_open,
dock_visible,
dock_anchor,
timestamp
@ -160,11 +160,11 @@ impl WorkspaceDb {
ON CONFLICT DO
UPDATE SET
workspace_location = ?2,
project_panel_open = ?3,
left_sidebar_open = ?3,
dock_visible = ?4,
dock_anchor = ?5,
timestamp = CURRENT_TIMESTAMP
))?((workspace.id, &workspace.location, workspace.project_panel_open, workspace.dock_position))
))?((workspace.id, &workspace.location, workspace.left_sidebar_open, workspace.dock_position))
.context("Updating workspace")?;
// Save center pane group and dock pane
@ -198,7 +198,8 @@ impl WorkspaceDb {
query! {
pub fn recent_workspaces(limit: usize) -> Result<Vec<(WorkspaceId, WorkspaceLocation)>> {
SELECT workspace_id, workspace_location
FROM workspaces
FROM workspaces
WHERE workspace_location IS NOT NULL
ORDER BY timestamp DESC
LIMIT ?
}
@ -458,7 +459,7 @@ mod tests {
dock_position: crate::dock::DockPosition::Shown(DockAnchor::Bottom),
center_group: Default::default(),
dock_pane: Default::default(),
project_panel_open: true
left_sidebar_open: true
};
let mut workspace_2 = SerializedWorkspace {
@ -467,7 +468,7 @@ mod tests {
dock_position: crate::dock::DockPosition::Hidden(DockAnchor::Expanded),
center_group: Default::default(),
dock_pane: Default::default(),
project_panel_open: false
left_sidebar_open: false
};
db.save_workspace(workspace_1.clone()).await;
@ -573,7 +574,7 @@ mod tests {
dock_position: DockPosition::Shown(DockAnchor::Bottom),
center_group,
dock_pane,
project_panel_open: true
left_sidebar_open: true
};
db.save_workspace(workspace.clone()).await;
@ -601,7 +602,7 @@ mod tests {
dock_position: crate::dock::DockPosition::Shown(DockAnchor::Bottom),
center_group: Default::default(),
dock_pane: Default::default(),
project_panel_open: true,
left_sidebar_open: true,
};
let mut workspace_2 = SerializedWorkspace {
@ -610,7 +611,7 @@ mod tests {
dock_position: crate::dock::DockPosition::Hidden(DockAnchor::Expanded),
center_group: Default::default(),
dock_pane: Default::default(),
project_panel_open: false,
left_sidebar_open: false,
};
db.save_workspace(workspace_1.clone()).await;
@ -646,7 +647,7 @@ mod tests {
dock_position: DockPosition::Shown(DockAnchor::Right),
center_group: Default::default(),
dock_pane: Default::default(),
project_panel_open: false
left_sidebar_open: false
};
db.save_workspace(workspace_3.clone()).await;
@ -681,7 +682,7 @@ mod tests {
dock_position: crate::dock::DockPosition::Hidden(DockAnchor::Right),
center_group: center_group.clone(),
dock_pane,
project_panel_open: true
left_sidebar_open: true
}
}