
<img width="1266" alt="Screenshot 2024-06-10 at 14 33 32" src="https://github.com/zed-industries/zed/assets/1347854/c75de033-f2c8-4500-8b34-46b5f0260d3d"> This changes the recent projects panel to use the order of paths from the workspace rather than always being alphanumerical. This follows the work to introduce manual workspace ordering to ensure the recent projects paths reflect the order of paths in the main project panel. Release Notes: - Improve the recent project panel by ordering paths using the workspace order
446 lines
14 KiB
Rust
446 lines
14 KiB
Rust
use super::{SerializedAxis, SerializedWindowBounds};
|
|
use crate::{item::ItemHandle, ItemDeserializers, Member, Pane, PaneAxis, Workspace, WorkspaceId};
|
|
use anyhow::{Context, Result};
|
|
use async_recursion::async_recursion;
|
|
use client::DevServerProjectId;
|
|
use db::sqlez::{
|
|
bindable::{Bind, Column, StaticColumnCount},
|
|
statement::Statement,
|
|
};
|
|
use gpui::{AsyncWindowContext, Model, Task, View, WeakView};
|
|
use project::Project;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::{
|
|
path::{Path, PathBuf},
|
|
sync::Arc,
|
|
};
|
|
use util::ResultExt;
|
|
use uuid::Uuid;
|
|
|
|
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
|
|
pub struct SerializedDevServerProject {
|
|
pub id: DevServerProjectId,
|
|
pub dev_server_name: String,
|
|
pub path: String,
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub struct LocalPaths(Arc<Vec<PathBuf>>);
|
|
|
|
impl LocalPaths {
|
|
pub fn new<P: AsRef<Path>>(paths: impl IntoIterator<Item = P>) -> Self {
|
|
let mut paths: Vec<PathBuf> = paths
|
|
.into_iter()
|
|
.map(|p| p.as_ref().to_path_buf())
|
|
.collect();
|
|
// Ensure all future `zed workspace1 workspace2` and `zed workspace2 workspace1` calls are using the same workspace.
|
|
// The actual workspace order is stored in the `LocalPathsOrder` struct.
|
|
paths.sort();
|
|
Self(Arc::new(paths))
|
|
}
|
|
|
|
pub fn paths(&self) -> &Arc<Vec<PathBuf>> {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl From<LocalPaths> for SerializedWorkspaceLocation {
|
|
fn from(local_paths: LocalPaths) -> Self {
|
|
let order = LocalPathsOrder::default_for_paths(&local_paths);
|
|
Self::Local(local_paths, order)
|
|
}
|
|
}
|
|
|
|
impl StaticColumnCount for LocalPaths {}
|
|
impl Bind for &LocalPaths {
|
|
fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
|
|
statement.bind(&bincode::serialize(&self.0)?, start_index)
|
|
}
|
|
}
|
|
|
|
impl Column for LocalPaths {
|
|
fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
|
|
let path_blob = statement.column_blob(start_index)?;
|
|
let paths: Arc<Vec<PathBuf>> = if path_blob.is_empty() {
|
|
Default::default()
|
|
} else {
|
|
bincode::deserialize(path_blob).context("Bincode deserialization of paths failed")?
|
|
};
|
|
|
|
Ok((Self(paths), start_index + 1))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub struct LocalPathsOrder(Vec<usize>);
|
|
|
|
impl LocalPathsOrder {
|
|
pub fn new(order: impl IntoIterator<Item = usize>) -> Self {
|
|
Self(order.into_iter().collect())
|
|
}
|
|
|
|
pub fn order(&self) -> &[usize] {
|
|
self.0.as_slice()
|
|
}
|
|
|
|
pub fn default_for_paths(paths: &LocalPaths) -> Self {
|
|
Self::new(0..paths.0.len())
|
|
}
|
|
}
|
|
|
|
impl StaticColumnCount for LocalPathsOrder {}
|
|
impl Bind for &LocalPathsOrder {
|
|
fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
|
|
statement.bind(&bincode::serialize(&self.0)?, start_index)
|
|
}
|
|
}
|
|
|
|
impl Column for LocalPathsOrder {
|
|
fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
|
|
let order_blob = statement.column_blob(start_index)?;
|
|
let order = if order_blob.is_empty() {
|
|
Vec::new()
|
|
} else {
|
|
bincode::deserialize(order_blob).context("deserializing workspace root order")?
|
|
};
|
|
|
|
Ok((Self(order), start_index + 1))
|
|
}
|
|
}
|
|
|
|
impl From<SerializedDevServerProject> for SerializedWorkspaceLocation {
|
|
fn from(dev_server_project: SerializedDevServerProject) -> Self {
|
|
Self::DevServer(dev_server_project)
|
|
}
|
|
}
|
|
|
|
impl StaticColumnCount for SerializedDevServerProject {}
|
|
impl Bind for &SerializedDevServerProject {
|
|
fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
|
|
let next_index = statement.bind(&self.id.0, start_index)?;
|
|
let next_index = statement.bind(&self.dev_server_name, next_index)?;
|
|
statement.bind(&self.path, next_index)
|
|
}
|
|
}
|
|
|
|
impl Column for SerializedDevServerProject {
|
|
fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
|
|
let id = statement.column_int64(start_index)?;
|
|
let dev_server_name = statement.column_text(start_index + 1)?.to_string();
|
|
let path = statement.column_text(start_index + 2)?.to_string();
|
|
Ok((
|
|
Self {
|
|
id: DevServerProjectId(id as u64),
|
|
dev_server_name,
|
|
path,
|
|
},
|
|
start_index + 3,
|
|
))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub enum SerializedWorkspaceLocation {
|
|
Local(LocalPaths, LocalPathsOrder),
|
|
DevServer(SerializedDevServerProject),
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub(crate) struct SerializedWorkspace {
|
|
pub(crate) id: WorkspaceId,
|
|
pub(crate) location: SerializedWorkspaceLocation,
|
|
pub(crate) center_group: SerializedPaneGroup,
|
|
pub(crate) window_bounds: Option<SerializedWindowBounds>,
|
|
pub(crate) centered_layout: bool,
|
|
pub(crate) display: Option<Uuid>,
|
|
pub(crate) docks: DockStructure,
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone, Default)]
|
|
pub struct DockStructure {
|
|
pub(crate) left: DockData,
|
|
pub(crate) right: DockData,
|
|
pub(crate) bottom: DockData,
|
|
}
|
|
|
|
impl Column for DockStructure {
|
|
fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
|
|
let (left, next_index) = DockData::column(statement, start_index)?;
|
|
let (right, next_index) = DockData::column(statement, next_index)?;
|
|
let (bottom, next_index) = DockData::column(statement, next_index)?;
|
|
Ok((
|
|
DockStructure {
|
|
left,
|
|
right,
|
|
bottom,
|
|
},
|
|
next_index,
|
|
))
|
|
}
|
|
}
|
|
|
|
impl Bind for DockStructure {
|
|
fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
|
|
let next_index = statement.bind(&self.left, start_index)?;
|
|
let next_index = statement.bind(&self.right, next_index)?;
|
|
statement.bind(&self.bottom, next_index)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone, Default)]
|
|
pub struct DockData {
|
|
pub(crate) visible: bool,
|
|
pub(crate) active_panel: Option<String>,
|
|
pub(crate) zoom: bool,
|
|
}
|
|
|
|
impl Column for DockData {
|
|
fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
|
|
let (visible, next_index) = Option::<bool>::column(statement, start_index)?;
|
|
let (active_panel, next_index) = Option::<String>::column(statement, next_index)?;
|
|
let (zoom, next_index) = Option::<bool>::column(statement, next_index)?;
|
|
Ok((
|
|
DockData {
|
|
visible: visible.unwrap_or(false),
|
|
active_panel,
|
|
zoom: zoom.unwrap_or(false),
|
|
},
|
|
next_index,
|
|
))
|
|
}
|
|
}
|
|
|
|
impl Bind for DockData {
|
|
fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
|
|
let next_index = statement.bind(&self.visible, start_index)?;
|
|
let next_index = statement.bind(&self.active_panel, next_index)?;
|
|
statement.bind(&self.zoom, next_index)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub(crate) enum SerializedPaneGroup {
|
|
Group {
|
|
axis: SerializedAxis,
|
|
flexes: Option<Vec<f32>>,
|
|
children: Vec<SerializedPaneGroup>,
|
|
},
|
|
Pane(SerializedPane),
|
|
}
|
|
|
|
#[cfg(test)]
|
|
impl Default for SerializedPaneGroup {
|
|
fn default() -> Self {
|
|
Self::Pane(SerializedPane {
|
|
children: vec![SerializedItem::default()],
|
|
active: false,
|
|
})
|
|
}
|
|
}
|
|
|
|
impl SerializedPaneGroup {
|
|
#[async_recursion(?Send)]
|
|
pub(crate) async fn deserialize(
|
|
self,
|
|
project: &Model<Project>,
|
|
workspace_id: WorkspaceId,
|
|
workspace: WeakView<Workspace>,
|
|
cx: &mut AsyncWindowContext,
|
|
) -> Option<(Member, Option<View<Pane>>, Vec<Option<Box<dyn ItemHandle>>>)> {
|
|
match self {
|
|
SerializedPaneGroup::Group {
|
|
axis,
|
|
children,
|
|
flexes,
|
|
} => {
|
|
let mut current_active_pane = None;
|
|
let mut members = Vec::new();
|
|
let mut items = Vec::new();
|
|
for child in children {
|
|
if let Some((new_member, active_pane, new_items)) = child
|
|
.deserialize(project, workspace_id, workspace.clone(), cx)
|
|
.await
|
|
{
|
|
members.push(new_member);
|
|
items.extend(new_items);
|
|
current_active_pane = current_active_pane.or(active_pane);
|
|
}
|
|
}
|
|
|
|
if members.is_empty() {
|
|
return None;
|
|
}
|
|
|
|
if members.len() == 1 {
|
|
return Some((members.remove(0), current_active_pane, items));
|
|
}
|
|
|
|
Some((
|
|
Member::Axis(PaneAxis::load(axis.0, members, flexes)),
|
|
current_active_pane,
|
|
items,
|
|
))
|
|
}
|
|
SerializedPaneGroup::Pane(serialized_pane) => {
|
|
let pane = workspace
|
|
.update(cx, |workspace, cx| workspace.add_pane(cx).downgrade())
|
|
.log_err()?;
|
|
let active = serialized_pane.active;
|
|
let new_items = serialized_pane
|
|
.deserialize_to(project, &pane, workspace_id, workspace.clone(), cx)
|
|
.await
|
|
.log_err()?;
|
|
|
|
if pane.update(cx, |pane, _| pane.items_len() != 0).log_err()? {
|
|
let pane = pane.upgrade()?;
|
|
Some((Member::Pane(pane.clone()), active.then(|| pane), new_items))
|
|
} else {
|
|
let pane = pane.upgrade()?;
|
|
workspace
|
|
.update(cx, |workspace, cx| workspace.force_remove_pane(&pane, cx))
|
|
.log_err()?;
|
|
None
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Eq, Default, Clone)]
|
|
pub struct SerializedPane {
|
|
pub(crate) active: bool,
|
|
pub(crate) children: Vec<SerializedItem>,
|
|
}
|
|
|
|
impl SerializedPane {
|
|
pub fn new(children: Vec<SerializedItem>, active: bool) -> Self {
|
|
SerializedPane { children, active }
|
|
}
|
|
|
|
pub async fn deserialize_to(
|
|
&self,
|
|
project: &Model<Project>,
|
|
pane: &WeakView<Pane>,
|
|
workspace_id: WorkspaceId,
|
|
workspace: WeakView<Workspace>,
|
|
cx: &mut AsyncWindowContext,
|
|
) -> Result<Vec<Option<Box<dyn ItemHandle>>>> {
|
|
let mut item_tasks = Vec::new();
|
|
let mut active_item_index = None;
|
|
let mut preview_item_index = None;
|
|
for (index, item) in self.children.iter().enumerate() {
|
|
let project = project.clone();
|
|
item_tasks.push(pane.update(cx, |_, cx| {
|
|
if let Some(deserializer) = cx.global::<ItemDeserializers>().get(&item.kind) {
|
|
deserializer(project, workspace.clone(), workspace_id, item.item_id, cx)
|
|
} else {
|
|
Task::ready(Err(anyhow::anyhow!(
|
|
"Deserializer does not exist for item kind: {}",
|
|
item.kind
|
|
)))
|
|
}
|
|
})?);
|
|
if item.active {
|
|
active_item_index = Some(index);
|
|
}
|
|
if item.preview {
|
|
preview_item_index = Some(index);
|
|
}
|
|
}
|
|
|
|
let mut items = Vec::new();
|
|
for item_handle in futures::future::join_all(item_tasks).await {
|
|
let item_handle = item_handle.log_err();
|
|
items.push(item_handle.clone());
|
|
|
|
if let Some(item_handle) = item_handle {
|
|
pane.update(cx, |pane, cx| {
|
|
pane.add_item(item_handle.clone(), true, true, None, cx);
|
|
})?;
|
|
}
|
|
}
|
|
|
|
if let Some(active_item_index) = active_item_index {
|
|
pane.update(cx, |pane, cx| {
|
|
pane.activate_item(active_item_index, false, false, cx);
|
|
})?;
|
|
}
|
|
|
|
if let Some(preview_item_index) = preview_item_index {
|
|
pane.update(cx, |pane, cx| {
|
|
if let Some(item) = pane.item_for_index(preview_item_index) {
|
|
pane.set_preview_item_id(Some(item.item_id()), cx);
|
|
}
|
|
})?;
|
|
}
|
|
|
|
anyhow::Ok(items)
|
|
}
|
|
}
|
|
|
|
pub type GroupId = i64;
|
|
pub type PaneId = i64;
|
|
pub type ItemId = u64;
|
|
|
|
#[derive(Debug, PartialEq, Eq, Clone)]
|
|
pub struct SerializedItem {
|
|
pub kind: Arc<str>,
|
|
pub item_id: ItemId,
|
|
pub active: bool,
|
|
pub preview: bool,
|
|
}
|
|
|
|
impl SerializedItem {
|
|
pub fn new(kind: impl AsRef<str>, item_id: ItemId, active: bool, preview: bool) -> Self {
|
|
Self {
|
|
kind: Arc::from(kind.as_ref()),
|
|
item_id,
|
|
active,
|
|
preview,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
impl Default for SerializedItem {
|
|
fn default() -> Self {
|
|
SerializedItem {
|
|
kind: Arc::from("Terminal"),
|
|
item_id: 100000,
|
|
active: false,
|
|
preview: false,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl StaticColumnCount for SerializedItem {
|
|
fn column_count() -> usize {
|
|
4
|
|
}
|
|
}
|
|
impl Bind for &SerializedItem {
|
|
fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
|
|
let next_index = statement.bind(&self.kind, start_index)?;
|
|
let next_index = statement.bind(&self.item_id, next_index)?;
|
|
let next_index = statement.bind(&self.active, next_index)?;
|
|
statement.bind(&self.preview, next_index)
|
|
}
|
|
}
|
|
|
|
impl Column for SerializedItem {
|
|
fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
|
|
let (kind, next_index) = Arc::<str>::column(statement, start_index)?;
|
|
let (item_id, next_index) = ItemId::column(statement, next_index)?;
|
|
let (active, next_index) = bool::column(statement, next_index)?;
|
|
let (preview, next_index) = bool::column(statement, next_index)?;
|
|
Ok((
|
|
SerializedItem {
|
|
kind,
|
|
item_id,
|
|
active,
|
|
preview,
|
|
},
|
|
next_index,
|
|
))
|
|
}
|
|
}
|