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

Restore auto-save on focus change, re-enable workspace tests

Browse source
This commit is contained in:
Max Brunsfeld 2023-11-30 14:44:26 -08:00
parent c63ca09eed
commit a003a91212
13 changed files with 1350 additions and 1304 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/gpui2/src/app/test_context.rs
View file

@ -2,8 +2,8 @@ use crate::{
div, Action, AnyView, AnyWindowHandle, AppCell, AppContext, AsyncAppContext, div, Action, AnyView, AnyWindowHandle, AppCell, AppContext, AsyncAppContext,
BackgroundExecutor, Context, Div, Entity, EventEmitter, ForegroundExecutor, InputEvent, BackgroundExecutor, Context, Div, Entity, EventEmitter, ForegroundExecutor, InputEvent,
KeyDownEvent, Keystroke, Model, ModelContext, Render, Result, Task, TestDispatcher, KeyDownEvent, Keystroke, Model, ModelContext, Render, Result, Task, TestDispatcher,
TestPlatform, TestWindow, View, ViewContext, VisualContext, WindowContext, WindowHandle, TestPlatform, TestWindow, TestWindowHandlers, View, ViewContext, VisualContext, WindowContext,
WindowOptions, WindowHandle, WindowOptions,
}; };
use anyhow::{anyhow, bail}; use anyhow::{anyhow, bail};
use futures::{Stream, StreamExt}; use futures::{Stream, StreamExt};
@ -509,6 +509,39 @@ impl<'a> VisualTestContext<'a> {
pub fn simulate_input(&mut self, input: &str) { pub fn simulate_input(&mut self, input: &str) {
self.cx.simulate_input(self.window, input) self.cx.simulate_input(self.window, input)
} }
pub fn simulate_activation(&mut self) {
self.simulate_window_events(&mut |handlers| {
handlers
.active_status_change
.iter_mut()
.for_each(|f| f(true));
})
}
pub fn simulate_deactivation(&mut self) {
self.simulate_window_events(&mut |handlers| {
handlers
.active_status_change
.iter_mut()
.for_each(|f| f(false));
})
}
fn simulate_window_events(&mut self, f: &mut dyn FnMut(&mut TestWindowHandlers)) {
let handlers = self
.cx
.update_window(self.window, |_, cx| {
cx.window
.platform_window
.as_test()
.unwrap()
.handlers
.clone()
})
.unwrap();
f(&mut *handlers.lock());
}
} }
impl<'a> Context for VisualTestContext<'a> { impl<'a> Context for VisualTestContext<'a> {

5
crates/gpui2/src/platform.rs
View file

@ -158,6 +158,11 @@ pub(crate) trait PlatformWindow {
fn draw(&self, scene: Scene); fn draw(&self, scene: Scene);
fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas>; fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas>;
#[cfg(any(test, feature = "test-support"))]
fn as_test(&self) -> Option<&TestWindow> {
None
}
} }
pub trait PlatformDispatcher: Send + Sync { pub trait PlatformDispatcher: Send + Sync {

8
crates/gpui2/src/platform/test/platform.rs
View file

@ -189,13 +189,9 @@ impl Platform for TestPlatform {
unimplemented!() unimplemented!()
} }
fn on_become_active(&self, _callback: Box<dyn FnMut()>) { fn on_become_active(&self, _callback: Box<dyn FnMut()>) {}
unimplemented!()
}
fn on_resign_active(&self, _callback: Box<dyn FnMut()>) { fn on_resign_active(&self, _callback: Box<dyn FnMut()>) {}
unimplemented!()
}
fn on_quit(&self, _callback: Box<dyn FnMut()>) {} fn on_quit(&self, _callback: Box<dyn FnMut()>) {}

16
crates/gpui2/src/platform/test/window.rs
View file

@ -11,11 +11,11 @@ use std::{
}; };
#[derive(Default)] #[derive(Default)]
struct Handlers { pub(crate) struct TestWindowHandlers {
active_status_change: Vec<Box<dyn FnMut(bool)>>, pub(crate) active_status_change: Vec<Box<dyn FnMut(bool)>>,
input: Vec<Box<dyn FnMut(crate::InputEvent) -> bool>>, pub(crate) input: Vec<Box<dyn FnMut(crate::InputEvent) -> bool>>,
moved: Vec<Box<dyn FnMut()>>, pub(crate) moved: Vec<Box<dyn FnMut()>>,
resize: Vec<Box<dyn FnMut(Size<Pixels>, f32)>>, pub(crate) resize: Vec<Box<dyn FnMut(Size<Pixels>, f32)>>,
} }
pub struct TestWindow { pub struct TestWindow {
@ -23,7 +23,7 @@ pub struct TestWindow {
current_scene: Mutex<Option<Scene>>, current_scene: Mutex<Option<Scene>>,
display: Rc<dyn PlatformDisplay>, display: Rc<dyn PlatformDisplay>,
pub(crate) input_handler: Option<Arc<Mutex<Box<dyn PlatformInputHandler>>>>, pub(crate) input_handler: Option<Arc<Mutex<Box<dyn PlatformInputHandler>>>>,
handlers: Mutex<Handlers>, pub(crate) handlers: Arc<Mutex<TestWindowHandlers>>,
platform: Weak<TestPlatform>, platform: Weak<TestPlatform>,
sprite_atlas: Arc<dyn PlatformAtlas>, sprite_atlas: Arc<dyn PlatformAtlas>,
} }
@ -167,6 +167,10 @@ impl PlatformWindow for TestWindow {
fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> { fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
self.sprite_atlas.clone() self.sprite_atlas.clone()
} }
fn as_test(&self) -> Option<&TestWindow> {
Some(self)
}
} }
pub struct TestAtlasState { pub struct TestAtlasState {

42
crates/workspace2/Cargo.toml
View file

@ -10,29 +10,29 @@ doctest = false
[features] [features]
test-support = [ test-support = [
"call2/test-support", "call/test-support",
"client2/test-support", "client/test-support",
"project2/test-support", "project/test-support",
"settings2/test-support", "settings/test-support",
"gpui/test-support", "gpui/test-support",
"fs2/test-support" "fs/test-support"
] ]
[dependencies] [dependencies]
db2 = { path = "../db2" } db = { path = "../db2", package = "db2" }
client2 = { path = "../client2" } client = { path = "../client2", package = "client2" }
collections = { path = "../collections" } collections = { path = "../collections" }
# context_menu = { path = "../context_menu" } # context_menu = { path = "../context_menu" }
fs2 = { path = "../fs2" } fs = { path = "../fs2", package = "fs2" }
gpui = { package = "gpui2", path = "../gpui2" } gpui = { package = "gpui2", path = "../gpui2" }
install_cli2 = { path = "../install_cli2" } install_cli = { path = "../install_cli2", package = "install_cli2" }
language2 = { path = "../language2" } language = { path = "../language2", package = "language2" }
#menu = { path = "../menu" } #menu = { path = "../menu" }
node_runtime = { path = "../node_runtime" } node_runtime = { path = "../node_runtime" }
project2 = { path = "../project2" } project = { path = "../project2", package = "project2" }
settings2 = { path = "../settings2" } settings = { path = "../settings2", package = "settings2" }
terminal2 = { path = "../terminal2" } terminal = { path = "../terminal2", package = "terminal2" }
theme2 = { path = "../theme2" } theme = { path = "../theme2", package = "theme2" }
util = { path = "../util" } util = { path = "../util" }
ui = { package = "ui2", path = "../ui2" } ui = { package = "ui2", path = "../ui2" }
@ -54,13 +54,13 @@ smallvec.workspace = true
uuid.workspace = true uuid.workspace = true
[dev-dependencies] [dev-dependencies]
call2 = { path = "../call2", features = ["test-support"] } call = { path = "../call2", package = "call2", features = ["test-support"] }
client2 = { path = "../client2", features = ["test-support"] } client = { path = "../client2", package = "client2", features = ["test-support"] }
gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] } gpui = { path = "../gpui2", package = "gpui2", features = ["test-support"] }
project2 = { path = "../project2", features = ["test-support"] } project = { path = "../project2", package = "project2", features = ["test-support"] }
settings2 = { path = "../settings2", features = ["test-support"] } settings = { path = "../settings2", package = "settings2", features = ["test-support"] }
fs2 = { path = "../fs2", features = ["test-support"] } fs = { path = "../fs2", package = "fs2", features = ["test-support"] }
db2 = { path = "../db2", features = ["test-support"] } db = { path = "../db2", package = "db2", features = ["test-support"] }
indoc.workspace = true indoc.workspace = true
env_logger.workspace = true env_logger.workspace = true

528
crates/workspace2/src/item.rs
View file

@ -7,7 +7,7 @@ use crate::{
ViewId, Workspace, WorkspaceId, ViewId, Workspace, WorkspaceId,
}; };
use anyhow::Result; use anyhow::Result;
use client2::{ use client::{
proto::{self, PeerId}, proto::{self, PeerId},
Client, Client,
}; };
@ -16,10 +16,10 @@ use gpui::{
HighlightStyle, Model, Pixels, Point, SharedString, Task, View, ViewContext, WeakView, HighlightStyle, Model, Pixels, Point, SharedString, Task, View, ViewContext, WeakView,
WindowContext, WindowContext,
}; };
use project2::{Project, ProjectEntryId, ProjectPath}; use project::{Project, ProjectEntryId, ProjectPath};
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use settings2::Settings; use settings::Settings;
use smallvec::SmallVec; use smallvec::SmallVec;
use std::{ use std::{
any::{Any, TypeId}, any::{Any, TypeId},
@ -33,7 +33,7 @@ use std::{
}, },
time::Duration, time::Duration,
}; };
use theme2::Theme; use theme::Theme;
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct ItemSettings { pub struct ItemSettings {
@ -110,7 +110,7 @@ pub trait Item: FocusableView + EventEmitter<ItemEvent> {
fn for_each_project_item( fn for_each_project_item(
&self, &self,
_: &AppContext, _: &AppContext,
_: &mut dyn FnMut(EntityId, &dyn project2::Item), _: &mut dyn FnMut(EntityId, &dyn project::Item),
) { ) {
} }
fn is_singleton(&self, _cx: &AppContext) -> bool { fn is_singleton(&self, _cx: &AppContext) -> bool {
@ -222,7 +222,7 @@ pub trait ItemHandle: 'static + Send {
fn for_each_project_item( fn for_each_project_item(
&self, &self,
_: &AppContext, _: &AppContext,
_: &mut dyn FnMut(EntityId, &dyn project2::Item), _: &mut dyn FnMut(EntityId, &dyn project::Item),
); );
fn is_singleton(&self, cx: &AppContext) -> bool; fn is_singleton(&self, cx: &AppContext) -> bool;
fn boxed_clone(&self) -> Box<dyn ItemHandle>; fn boxed_clone(&self) -> Box<dyn ItemHandle>;
@ -347,7 +347,7 @@ impl<T: Item> ItemHandle for View<T> {
fn for_each_project_item( fn for_each_project_item(
&self, &self,
cx: &AppContext, cx: &AppContext,
f: &mut dyn FnMut(EntityId, &dyn project2::Item), f: &mut dyn FnMut(EntityId, &dyn project::Item),
) { ) {
self.read(cx).for_each_project_item(cx, f) self.read(cx).for_each_project_item(cx, f)
} }
@ -375,6 +375,7 @@ impl<T: Item> ItemHandle for View<T> {
pane: View<Pane>, pane: View<Pane>,
cx: &mut ViewContext<Workspace>, cx: &mut ViewContext<Workspace>,
) { ) {
let weak_item = self.downgrade();
let history = pane.read(cx).nav_history_for_item(self); let history = pane.read(cx).nav_history_for_item(self);
self.update(cx, |this, cx| { self.update(cx, |this, cx| {
this.set_nav_history(history, cx); this.set_nav_history(history, cx);
@ -491,16 +492,15 @@ impl<T: Item> ItemHandle for View<T> {
} }
})); }));
// todo!() cx.on_blur(&self.focus_handle(cx), move |workspace, cx| {
// cx.observe_focus(self, move |workspace, item, focused, cx| { if WorkspaceSettings::get_global(cx).autosave == AutosaveSetting::OnFocusChange {
// if !focused if let Some(item) = weak_item.upgrade() {
// && WorkspaceSettings::get_global(cx).autosave == AutosaveSetting::OnFocusChange Pane::autosave_item(&item, workspace.project.clone(), cx)
// { .detach_and_log_err(cx);
// Pane::autosave_item(&item, workspace.project.clone(), cx) }
// .detach_and_log_err(cx); }
// } })
// }) .detach();
// .detach();
let item_id = self.item_id(); let item_id = self.item_id();
cx.observe_release(self, move |workspace, _, _| { cx.observe_release(self, move |workspace, _, _| {
@ -640,7 +640,7 @@ impl<T: Item> WeakItemHandle for WeakView<T> {
} }
pub trait ProjectItem: Item { pub trait ProjectItem: Item {
type Item: project2::Item; type Item: project::Item;
fn for_project_item( fn for_project_item(
project: Model<Project>, project: Model<Project>,
@ -759,56 +759,52 @@ impl<T: FollowableItem> FollowableItemHandle for View<T> {
} }
} }
// #[cfg(any(test, feature = "test-support"))] #[cfg(any(test, feature = "test-support"))]
// pub mod test { pub mod test {
// use super::{Item, ItemEvent}; use super::{Item, ItemEvent};
// use crate::{ItemId, ItemNavHistory, Pane, Workspace, WorkspaceId}; use crate::{ItemId, ItemNavHistory, Pane, Workspace, WorkspaceId};
// use gpui::{ use gpui::{
// elements::Empty, AnyElement, AppContext, Element, Entity, Model, Task, View, AnyElement, AppContext, Context as _, Div, EntityId, EventEmitter, FocusableView,
// ViewContext, View, WeakViewHandle, IntoElement, Model, Render, SharedString, Task, View, ViewContext, VisualContext, WeakView,
// }; };
// use project2::{Project, ProjectEntryId, ProjectPath, WorktreeId}; use project::{Project, ProjectEntryId, ProjectPath, WorktreeId};
// use smallvec::SmallVec; use std::{any::Any, cell::Cell, path::Path};
// use std::{any::Any, borrow::Cow, cell::Cell, path::Path};
// pub struct TestProjectItem { pub struct TestProjectItem {
// pub entry_id: Option<ProjectEntryId>, pub entry_id: Option<ProjectEntryId>,
// pub project_path: Option<ProjectPath>, pub project_path: Option<ProjectPath>,
// } }
// pub struct TestItem { pub struct TestItem {
// pub workspace_id: WorkspaceId, pub workspace_id: WorkspaceId,
// pub state: String, pub state: String,
// pub label: String, pub label: String,
// pub save_count: usize, pub save_count: usize,
// pub save_as_count: usize, pub save_as_count: usize,
// pub reload_count: usize, pub reload_count: usize,
// pub is_dirty: bool, pub is_dirty: bool,
// pub is_singleton: bool, pub is_singleton: bool,
// pub has_conflict: bool, pub has_conflict: bool,
// pub project_items: Vec<Model<TestProjectItem>>, pub project_items: Vec<Model<TestProjectItem>>,
// pub nav_history: Option<ItemNavHistory>, pub nav_history: Option<ItemNavHistory>,
// pub tab_descriptions: Option<Vec<&'static str>>, pub tab_descriptions: Option<Vec<&'static str>>,
// pub tab_detail: Cell<Option<usize>>, pub tab_detail: Cell<Option<usize>>,
// } focus_handle: gpui::FocusHandle,
}
// impl Entity for TestProjectItem { impl project::Item for TestProjectItem {
// type Event = (); fn entry_id(&self, _: &AppContext) -> Option<ProjectEntryId> {
// } self.entry_id
}
// impl project2::Item for TestProjectItem { fn project_path(&self, _: &AppContext) -> Option<ProjectPath> {
// fn entry_id(&self, _: &AppContext) -> Option<ProjectEntryId> { self.project_path.clone()
// self.entry_id }
// } }
// fn project_path(&self, _: &AppContext) -> Option<ProjectPath> { pub enum TestItemEvent {
// self.project_path.clone() Edit,
// } }
// }
// pub enum TestItemEvent {
// Edit,
// }
// impl Clone for TestItem { // impl Clone for TestItem {
// fn clone(&self) -> Self { // fn clone(&self) -> Self {
@ -826,233 +822,247 @@ impl<T: FollowableItem> FollowableItemHandle for View<T> {
// tab_descriptions: None, // tab_descriptions: None,
// tab_detail: Default::default(), // tab_detail: Default::default(),
// workspace_id: self.workspace_id, // workspace_id: self.workspace_id,
// focus_handle: self.focus_handle.clone(),
// } // }
// } // }
// } // }
// impl TestProjectItem { impl TestProjectItem {
// pub fn new(id: u64, path: &str, cx: &mut AppContext) -> Model<Self> { pub fn new(id: u64, path: &str, cx: &mut AppContext) -> Model<Self> {
// let entry_id = Some(ProjectEntryId::from_proto(id)); let entry_id = Some(ProjectEntryId::from_proto(id));
// let project_path = Some(ProjectPath { let project_path = Some(ProjectPath {
// worktree_id: WorktreeId::from_usize(0), worktree_id: WorktreeId::from_usize(0),
// path: Path::new(path).into(), path: Path::new(path).into(),
// }); });
// cx.add_model(|_| Self { cx.build_model(|_| Self {
// entry_id, entry_id,
// project_path, project_path,
// }) })
// } }
// pub fn new_untitled(cx: &mut AppContext) -> Model<Self> { pub fn new_untitled(cx: &mut AppContext) -> Model<Self> {
// cx.add_model(|_| Self { cx.build_model(|_| Self {
// project_path: None, project_path: None,
// entry_id: None, entry_id: None,
// }) })
// } }
// } }
// impl TestItem { impl TestItem {
// pub fn new() -> Self { pub fn new(cx: &mut ViewContext<Self>) -> Self {
// Self { Self {
// state: String::new(), state: String::new(),
// label: String::new(), label: String::new(),
// save_count: 0, save_count: 0,
// save_as_count: 0, save_as_count: 0,
// reload_count: 0, reload_count: 0,
// is_dirty: false, is_dirty: false,
// has_conflict: false, has_conflict: false,
// project_items: Vec::new(), project_items: Vec::new(),
// is_singleton: true, is_singleton: true,
// nav_history: None, nav_history: None,
// tab_descriptions: None, tab_descriptions: None,
// tab_detail: Default::default(), tab_detail: Default::default(),
// workspace_id: 0, workspace_id: 0,
// } focus_handle: cx.focus_handle(),
// } }
}
// pub fn new_deserialized(id: WorkspaceId) -> Self { pub fn new_deserialized(id: WorkspaceId, cx: &mut ViewContext<Self>) -> Self {
// let mut this = Self::new(); let mut this = Self::new(cx);
// this.workspace_id = id; this.workspace_id = id;
// this this
// } }
// pub fn with_label(mut self, state: &str) -> Self { pub fn with_label(mut self, state: &str) -> Self {
// self.label = state.to_string(); self.label = state.to_string();
// self self
// } }
// pub fn with_singleton(mut self, singleton: bool) -> Self { pub fn with_singleton(mut self, singleton: bool) -> Self {
// self.is_singleton = singleton; self.is_singleton = singleton;
// self self
// } }
// pub fn with_dirty(mut self, dirty: bool) -> Self { pub fn with_dirty(mut self, dirty: bool) -> Self {
// self.is_dirty = dirty; self.is_dirty = dirty;
// self self
// } }
// pub fn with_conflict(mut self, has_conflict: bool) -> Self { pub fn with_conflict(mut self, has_conflict: bool) -> Self {
// self.has_conflict = has_conflict; self.has_conflict = has_conflict;
// self self
// } }
// pub fn with_project_items(mut self, items: &[Model<TestProjectItem>]) -> Self { pub fn with_project_items(mut self, items: &[Model<TestProjectItem>]) -> Self {
// self.project_items.clear(); self.project_items.clear();
// self.project_items.extend(items.iter().cloned()); self.project_items.extend(items.iter().cloned());
// self self
// } }
// pub fn set_state(&mut self, state: String, cx: &mut ViewContext<Self>) { pub fn set_state(&mut self, state: String, cx: &mut ViewContext<Self>) {
// self.push_to_nav_history(cx); self.push_to_nav_history(cx);
// self.state = state; self.state = state;
// } }
// fn push_to_nav_history(&mut self, cx: &mut ViewContext<Self>) { fn push_to_nav_history(&mut self, cx: &mut ViewContext<Self>) {
// if let Some(history) = &mut self.nav_history { if let Some(history) = &mut self.nav_history {
// history.push(Some(Box::new(self.state.clone())), cx); history.push(Some(Box::new(self.state.clone())), cx);
// } }
// } }
// } }
// impl Entity for TestItem { impl Render for TestItem {
// type Event = TestItemEvent; type Element = Div;
// }
// impl View for TestItem { fn render(&mut self, _: &mut ViewContext<Self>) -> Self::Element {
// fn ui_name() -> &'static str { gpui::div()
// "TestItem" }
// } }
// fn render(&mut self, _: &mut ViewContext<Self>) -> AnyElement<Self> { impl EventEmitter<ItemEvent> for TestItem {}
// Empty::new().into_any()
// }
// }
// impl Item for TestItem { impl FocusableView for TestItem {
// fn tab_description(&self, detail: usize, _: &AppContext) -> Option<Cow<str>> { fn focus_handle(&self, cx: &AppContext) -> gpui::FocusHandle {
// self.tab_descriptions.as_ref().and_then(|descriptions| { self.focus_handle.clone()
// let description = *descriptions.get(detail).or_else(|| descriptions.last())?; }
// Some(description.into()) }
// })
// }
// fn tab_content<V: 'static>( impl Item for TestItem {
// &self, fn tab_description(&self, detail: usize, _: &AppContext) -> Option<SharedString> {
// detail: Option<usize>, self.tab_descriptions.as_ref().and_then(|descriptions| {
// _: &theme2::Tab, let description = *descriptions.get(detail).or_else(|| descriptions.last())?;
// _: &AppContext, Some(description.into())
// ) -> AnyElement<V> { })
// self.tab_detail.set(detail); }
// Empty::new().into_any()
// }
// fn for_each_project_item( fn tab_content(
// &self, &self,
// cx: &AppContext, detail: Option<usize>,
// f: &mut dyn FnMut(usize, &dyn project2::Item), cx: &ui::prelude::WindowContext,
// ) { ) -> AnyElement {
// self.project_items self.tab_detail.set(detail);
// .iter() gpui::div().into_any_element()
// .for_each(|item| f(item.id(), item.read(cx))) }
// }
// fn is_singleton(&self, _: &AppContext) -> bool { fn for_each_project_item(
// self.is_singleton &self,
// } cx: &AppContext,
f: &mut dyn FnMut(EntityId, &dyn project::Item),
) {
self.project_items
.iter()
.for_each(|item| f(item.entity_id(), item.read(cx)))
}
// fn set_nav_history(&mut self, history: ItemNavHistory, _: &mut ViewContext<Self>) { fn is_singleton(&self, _: &AppContext) -> bool {
// self.nav_history = Some(history); self.is_singleton
// } }
// fn navigate(&mut self, state: Box<dyn Any>, _: &mut ViewContext<Self>) -> bool { fn set_nav_history(&mut self, history: ItemNavHistory, _: &mut ViewContext<Self>) {
// let state = *state.downcast::<String>().unwrap_or_default(); self.nav_history = Some(history);
// if state != self.state { }
// self.state = state;
// true
// } else {
// false
// }
// }
// fn deactivated(&mut self, cx: &mut ViewContext<Self>) { fn navigate(&mut self, state: Box<dyn Any>, _: &mut ViewContext<Self>) -> bool {
// self.push_to_nav_history(cx); let state = *state.downcast::<String>().unwrap_or_default();
// } if state != self.state {
self.state = state;
true
} else {
false
}
}
// fn clone_on_split( fn deactivated(&mut self, cx: &mut ViewContext<Self>) {
// &self, self.push_to_nav_history(cx);
// _workspace_id: WorkspaceId, }
// _: &mut ViewContext<Self>,
// ) -> Option<Self>
// where
// Self: Sized,
// {
// Some(self.clone())
// }
// fn is_dirty(&self, _: &AppContext) -> bool { fn clone_on_split(
// self.is_dirty &self,
// } _workspace_id: WorkspaceId,
cx: &mut ViewContext<Self>,
) -> Option<View<Self>>
where
Self: Sized,
{
Some(cx.build_view(|cx| Self {
state: self.state.clone(),
label: self.label.clone(),
save_count: self.save_count,
save_as_count: self.save_as_count,
reload_count: self.reload_count,
is_dirty: self.is_dirty,
is_singleton: self.is_singleton,
has_conflict: self.has_conflict,
project_items: self.project_items.clone(),
nav_history: None,
tab_descriptions: None,
tab_detail: Default::default(),
workspace_id: self.workspace_id,
focus_handle: cx.focus_handle(),
}))
}
// fn has_conflict(&self, _: &AppContext) -> bool { fn is_dirty(&self, _: &AppContext) -> bool {
// self.has_conflict self.is_dirty
// } }
// fn can_save(&self, cx: &AppContext) -> bool { fn has_conflict(&self, _: &AppContext) -> bool {
// !self.project_items.is_empty() self.has_conflict
// && self }
// .project_items
// .iter()
// .all(|item| item.read(cx).entry_id.is_some())
// }
// fn save( fn can_save(&self, cx: &AppContext) -> bool {
// &mut self, !self.project_items.is_empty()
// _: Model<Project>, && self
// _: &mut ViewContext<Self>, .project_items
// ) -> Task<anyhow::Result<()>> { .iter()
// self.save_count += 1; .all(|item| item.read(cx).entry_id.is_some())
// self.is_dirty = false; }
// Task::ready(Ok(()))
// }
// fn save_as( fn save(
// &mut self, &mut self,
// _: Model<Project>, _: Model<Project>,
// _: std::path::PathBuf, _: &mut ViewContext<Self>,
// _: &mut ViewContext<Self>, ) -> Task<anyhow::Result<()>> {
// ) -> Task<anyhow::Result<()>> { self.save_count += 1;
// self.save_as_count += 1; self.is_dirty = false;
// self.is_dirty = false; Task::ready(Ok(()))
// Task::ready(Ok(())) }
// }
// fn reload( fn save_as(
// &mut self, &mut self,
// _: Model<Project>, _: Model<Project>,
// _: &mut ViewContext<Self>, _: std::path::PathBuf,
// ) -> Task<anyhow::Result<()>> { _: &mut ViewContext<Self>,
// self.reload_count += 1; ) -> Task<anyhow::Result<()>> {
// self.is_dirty = false; self.save_as_count += 1;
// Task::ready(Ok(())) self.is_dirty = false;
// } Task::ready(Ok(()))
}
// fn to_item_events(_: &Self::Event) -> SmallVec<[ItemEvent; 2]> { fn reload(
// [ItemEvent::UpdateTab, ItemEvent::Edit].into() &mut self,
// } _: Model<Project>,
_: &mut ViewContext<Self>,
) -> Task<anyhow::Result<()>> {
self.reload_count += 1;
self.is_dirty = false;
Task::ready(Ok(()))
}
// fn serialized_item_kind() -> Option<&'static str> { fn serialized_item_kind() -> Option<&'static str> {
// Some("TestItem") Some("TestItem")
// } }
// fn deserialize( fn deserialize(
// _project: Model<Project>, _project: Model<Project>,
// _workspace: WeakViewHandle<Workspace>, _workspace: WeakView<Workspace>,
// workspace_id: WorkspaceId, workspace_id: WorkspaceId,
// _item_id: ItemId, _item_id: ItemId,
// cx: &mut ViewContext<Pane>, cx: &mut ViewContext<Pane>,
// ) -> Task<anyhow::Result<View<Self>>> { ) -> Task<anyhow::Result<View<Self>>> {
// let view = cx.add_view(|_cx| Self::new_deserialized(workspace_id)); let view = cx.build_view(|cx| Self::new_deserialized(workspace_id, cx));
// Task::Ready(Some(anyhow::Ok(view))) Task::Ready(Some(anyhow::Ok(view)))
// } }
// } }
// } }

4
crates/workspace2/src/pane.rs
View file

@ -12,9 +12,9 @@ use gpui::{
ViewContext, VisualContext, WeakView, WindowContext, ViewContext, VisualContext, WeakView, WindowContext,
}; };
use parking_lot::Mutex; use parking_lot::Mutex;
use project2::{Project, ProjectEntryId, ProjectPath}; use project::{Project, ProjectEntryId, ProjectPath};
use serde::Deserialize; use serde::Deserialize;
use settings2::Settings; use settings::Settings;
use std::{ use std::{
any::Any, any::Any,
cmp, fmt, mem, cmp, fmt, mem,

4
crates/workspace2/src/pane_group.rs
View file

@ -1,7 +1,7 @@
use crate::{AppState, FollowerState, Pane, Workspace}; use crate::{AppState, FollowerState, Pane, Workspace};
use anyhow::{anyhow, bail, Result}; use anyhow::{anyhow, bail, Result};
use collections::HashMap; use collections::HashMap;
use db2::sqlez::{ use db::sqlez::{
bindable::{Bind, Column, StaticColumnCount}, bindable::{Bind, Column, StaticColumnCount},
statement::Statement, statement::Statement,
}; };
@ -9,7 +9,7 @@ use gpui::{
point, size, AnyWeakView, Bounds, Div, IntoElement, Model, Pixels, Point, View, ViewContext, point, size, AnyWeakView, Bounds, Div, IntoElement, Model, Pixels, Point, View, ViewContext,
}; };
use parking_lot::Mutex; use parking_lot::Mutex;
use project2::Project; use project::Project;
use serde::Deserialize; use serde::Deserialize;
use std::sync::Arc; use std::sync::Arc;
use ui::prelude::*; use ui::prelude::*;

4
crates/workspace2/src/persistence.rs
View file

@ -5,7 +5,7 @@ pub mod model;
use std::path::Path; use std::path::Path;
use anyhow::{anyhow, bail, Context, Result}; use anyhow::{anyhow, bail, Context, Result};
use db2::{define_connection, query, sqlez::connection::Connection, sqlez_macros::sql}; use db::{define_connection, query, sqlez::connection::Connection, sqlez_macros::sql};
use gpui::WindowBounds; use gpui::WindowBounds;
use util::{unzip_option, ResultExt}; use util::{unzip_option, ResultExt};
@ -552,7 +552,7 @@ impl WorkspaceDb {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use db2::open_test_db; use db::open_test_db;
use gpui; use gpui;
#[gpui::test] #[gpui::test]

4
crates/workspace2/src/persistence/model.rs
View file

@ -3,12 +3,12 @@ use crate::{
}; };
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use async_recursion::async_recursion; use async_recursion::async_recursion;
use db2::sqlez::{ use db::sqlez::{
bindable::{Bind, Column, StaticColumnCount}, bindable::{Bind, Column, StaticColumnCount},
statement::Statement, statement::Statement,
}; };
use gpui::{AsyncWindowContext, Model, Task, View, WeakView, WindowBounds}; use gpui::{AsyncWindowContext, Model, Task, View, WeakView, WindowBounds};
use project2::Project; use project::Project;
use std::{ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::Arc, sync::Arc,

2
crates/workspace2/src/searchable.rs
View file

@ -4,7 +4,7 @@ use gpui::{
AnyView, AppContext, EventEmitter, Subscription, Task, View, ViewContext, WeakView, AnyView, AppContext, EventEmitter, Subscription, Task, View, ViewContext, WeakView,
WindowContext, WindowContext,
}; };
use project2::search::SearchQuery; use project::search::SearchQuery;
use crate::{ use crate::{
item::{Item, WeakItemHandle}, item::{Item, WeakItemHandle},

672
crates/workspace2/src/workspace2.rs
View file

@ -16,7 +16,7 @@ mod workspace_settings;
use anyhow::{anyhow, Context as _, Result}; use anyhow::{anyhow, Context as _, Result};
use async_trait::async_trait; use async_trait::async_trait;
use client2::{ use client::{
proto::{self, PeerId}, proto::{self, PeerId},
Client, TypedEnvelope, User, UserStore, Client, TypedEnvelope, User, UserStore,
}; };
@ -37,7 +37,7 @@ use gpui::{
}; };
use item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ItemSettings, ProjectItem}; use item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ItemSettings, ProjectItem};
use itertools::Itertools; use itertools::Itertools;
use language2::{LanguageRegistry, Rope}; use language::{LanguageRegistry, Rope};
use lazy_static::lazy_static; use lazy_static::lazy_static;
pub use modal_layer::*; pub use modal_layer::*;
use node_runtime::NodeRuntime; use node_runtime::NodeRuntime;
@ -49,9 +49,9 @@ pub use persistence::{
WorkspaceDb, DB, WorkspaceDb, DB,
}; };
use postage::stream::Stream; use postage::stream::Stream;
use project2::{Project, ProjectEntryId, ProjectPath, Worktree, WorktreeId}; use project::{Project, ProjectEntryId, ProjectPath, Worktree, WorktreeId};
use serde::Deserialize; use serde::Deserialize;
use settings2::Settings; use settings::Settings;
use status_bar::StatusBar; use status_bar::StatusBar;
pub use status_bar::StatusItemView; pub use status_bar::StatusItemView;
use std::{ use std::{
@ -62,7 +62,7 @@ use std::{
sync::{atomic::AtomicUsize, Arc}, sync::{atomic::AtomicUsize, Arc},
time::Duration, time::Duration,
}; };
use theme2::{ActiveTheme, ThemeSettings}; use theme::{ActiveTheme, ThemeSettings};
pub use toolbar::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView}; pub use toolbar::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView};
pub use ui; pub use ui;
use util::ResultExt; use util::ResultExt;
@ -301,7 +301,7 @@ pub struct AppState {
pub client: Arc<Client>, pub client: Arc<Client>,
pub user_store: Model<UserStore>, pub user_store: Model<UserStore>,
pub workspace_store: Model<WorkspaceStore>, pub workspace_store: Model<WorkspaceStore>,
pub fs: Arc<dyn fs2::Fs>, pub fs: Arc<dyn fs::Fs>,
pub call_factory: CallFactory, pub call_factory: CallFactory,
pub build_window_options: pub build_window_options:
fn(Option<WindowBounds>, Option<Uuid>, &mut AppContext) -> WindowOptions, fn(Option<WindowBounds>, Option<Uuid>, &mut AppContext) -> WindowOptions,
@ -312,7 +312,7 @@ pub struct WorkspaceStore {
workspaces: HashSet<WindowHandle<Workspace>>, workspaces: HashSet<WindowHandle<Workspace>>,
followers: Vec<Follower>, followers: Vec<Follower>,
client: Arc<Client>, client: Arc<Client>,
_subscriptions: Vec<client2::Subscription>, _subscriptions: Vec<client::Subscription>,
} }
#[derive(PartialEq, Eq, PartialOrd, Ord, Debug)] #[derive(PartialEq, Eq, PartialOrd, Ord, Debug)]
@ -388,22 +388,22 @@ impl AppState {
#[cfg(any(test, feature = "test-support"))] #[cfg(any(test, feature = "test-support"))]
pub fn test(cx: &mut AppContext) -> Arc<Self> { pub fn test(cx: &mut AppContext) -> Arc<Self> {
use node_runtime::FakeNodeRuntime; use node_runtime::FakeNodeRuntime;
use settings2::SettingsStore; use settings::SettingsStore;
if !cx.has_global::<SettingsStore>() { if !cx.has_global::<SettingsStore>() {
let settings_store = SettingsStore::test(cx); let settings_store = SettingsStore::test(cx);
cx.set_global(settings_store); cx.set_global(settings_store);
} }
let fs = fs2::FakeFs::new(cx.background_executor().clone()); let fs = fs::FakeFs::new(cx.background_executor().clone());
let languages = Arc::new(LanguageRegistry::test()); let languages = Arc::new(LanguageRegistry::test());
let http_client = util::http::FakeHttpClient::with_404_response(); let http_client = util::http::FakeHttpClient::with_404_response();
let client = Client::new(http_client.clone(), cx); let client = Client::new(http_client.clone(), cx);
let user_store = cx.build_model(|cx| UserStore::new(client.clone(), http_client, cx)); let user_store = cx.build_model(|cx| UserStore::new(client.clone(), http_client, cx));
let workspace_store = cx.build_model(|cx| WorkspaceStore::new(client.clone(), cx)); let workspace_store = cx.build_model(|cx| WorkspaceStore::new(client.clone(), cx));
theme2::init(theme2::LoadThemes::JustBase, cx); theme::init(theme::LoadThemes::JustBase, cx);
client2::init(&client, cx); client::init(&client, cx);
crate::init_settings(cx); crate::init_settings(cx);
Arc::new(Self { Arc::new(Self {
@ -567,29 +567,29 @@ impl Workspace {
cx.observe(&project, |_, _, cx| cx.notify()).detach(); cx.observe(&project, |_, _, cx| cx.notify()).detach();
cx.subscribe(&project, move |this, _, event, cx| { cx.subscribe(&project, move |this, _, event, cx| {
match event { match event {
project2::Event::RemoteIdChanged(_) => { project::Event::RemoteIdChanged(_) => {
this.update_window_title(cx); this.update_window_title(cx);
} }
project2::Event::CollaboratorLeft(peer_id) => { project::Event::CollaboratorLeft(peer_id) => {
this.collaborator_left(*peer_id, cx); this.collaborator_left(*peer_id, cx);
} }
project2::Event::WorktreeRemoved(_) | project2::Event::WorktreeAdded => { project::Event::WorktreeRemoved(_) | project::Event::WorktreeAdded => {
this.update_window_title(cx); this.update_window_title(cx);
this.serialize_workspace(cx); this.serialize_workspace(cx);
} }
project2::Event::DisconnectedFromHost => { project::Event::DisconnectedFromHost => {
this.update_window_edited(cx); this.update_window_edited(cx);
cx.blur(); cx.blur();
} }
project2::Event::Closed => { project::Event::Closed => {
cx.remove_window(); cx.remove_window();
} }
project2::Event::DeletedEntry(entry_id) => { project::Event::DeletedEntry(entry_id) => {
for pane in this.panes.iter() { for pane in this.panes.iter() {
pane.update(cx, |pane, cx| { pane.update(cx, |pane, cx| {
pane.handle_deleted_project_item(*entry_id, cx) pane.handle_deleted_project_item(*entry_id, cx)
@ -597,7 +597,7 @@ impl Workspace {
} }
} }
project2::Event::Notification(message) => this.show_notification(0, cx, |cx| { project::Event::Notification(message) => this.show_notification(0, cx, |cx| {
cx.build_view(|_| MessageNotification::new(message.clone())) cx.build_view(|_| MessageNotification::new(message.clone()))
}), }),
@ -1450,7 +1450,7 @@ impl Workspace {
.map(|entry| entry.id); .map(|entry| entry.id);
if let Some(entry_id) = entry_id { if let Some(entry_id) = entry_id {
workspace.project.update(cx, |_, cx| { workspace.project.update(cx, |_, cx| {
cx.emit(project2::Event::ActiveEntryChanged(Some(entry_id))); cx.emit(project::Event::ActiveEntryChanged(Some(entry_id)));
}) })
} }
}) })
@ -1812,8 +1812,7 @@ impl Workspace {
}); });
cx.subscribe(&pane, Self::handle_pane_event).detach(); cx.subscribe(&pane, Self::handle_pane_event).detach();
self.panes.push(pane.clone()); self.panes.push(pane.clone());
// todo!() cx.focus_view(&pane);
// cx.focus(&pane);
cx.emit(Event::PaneAdded(pane.clone())); cx.emit(Event::PaneAdded(pane.clone()));
pane pane
} }
@ -1988,7 +1987,7 @@ impl Workspace {
where where
T: ProjectItem, T: ProjectItem,
{ {
use project2::Item as _; use project::Item as _;
let entry_id = project_item.read(cx).entry_id(cx); let entry_id = project_item.read(cx).entry_id(cx);
if let Some(item) = entry_id if let Some(item) = entry_id
@ -2013,7 +2012,7 @@ impl Workspace {
where where
T: ProjectItem, T: ProjectItem,
{ {
use project2::Item as _; use project::Item as _;
let entry_id = project_item.read(cx).entry_id(cx); let entry_id = project_item.read(cx).entry_id(cx);
if let Some(item) = entry_id if let Some(item) = entry_id
@ -3673,7 +3672,7 @@ fn notify_if_database_failed(workspace: WindowHandle<Workspace>, cx: &mut AsyncA
workspace workspace
.update(cx, |workspace, cx| { .update(cx, |workspace, cx| {
if (*db2::ALL_FILE_DB_FAILED).load(std::sync::atomic::Ordering::Acquire) { if (*db::ALL_FILE_DB_FAILED).load(std::sync::atomic::Ordering::Acquire) {
workspace.show_notification_once(0, cx, |cx| { workspace.show_notification_once(0, cx, |cx| {
cx.build_view(|_| { cx.build_view(|_| {
MessageNotification::new("Failed to load the database file.") MessageNotification::new("Failed to load the database file.")
@ -4554,68 +4553,70 @@ fn parse_pixel_size_env_var(value: &str) -> Option<Size<GlobalPixels>> {
Some(size((width as f64).into(), (height as f64).into())) Some(size((width as f64).into(), (height as f64).into()))
} }
// #[cfg(test)] #[cfg(test)]
// mod tests { mod tests {
// use super::*; use super::*;
// use crate::{ use crate::{
// dock::test::TestPanel, dock::test::TestPanel,
// item::test::{TestItem, TestItemEvent, TestProjectItem}, item::{
// }; test::{TestItem, TestItemEvent, TestProjectItem},
// use fs::FakeFs; ItemEvent,
// use gpui::{executor::Deterministic, test::EmptyView, TestAppContext}; },
// use project::{Project, ProjectEntryId}; };
// use serde_json::json; use fs::FakeFs;
// use settings::SettingsStore; use gpui::TestAppContext;
// use std::{cell::RefCell, rc::Rc}; use project::{Project, ProjectEntryId};
use serde_json::json;
use settings::SettingsStore;
use std::{cell::RefCell, rc::Rc};
// #[gpui::test] #[gpui::test]
// async fn test_tab_disambiguation(cx: &mut TestAppContext) { async fn test_tab_disambiguation(cx: &mut TestAppContext) {
// init_test(cx); init_test(cx);
// let fs = FakeFs::new(cx.background()); let fs = FakeFs::new(cx.executor());
// let project = Project::test(fs, [], cx).await; let project = Project::test(fs, [], cx).await;
// let window = cx.add_window(|cx| Workspace::test_new(project.clone(), cx)); let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project.clone(), cx));
// let workspace = window.root(cx);
// // Adding an item with no ambiguity renders the tab without detail. // Adding an item with no ambiguity renders the tab without detail.
// let item1 = window.build_view(cx, |_| { let item1 = cx.build_view(|cx| {
// let mut item = TestItem::new(); let mut item = TestItem::new(cx);
// item.tab_descriptions = Some(vec!["c", "b1/c", "a/b1/c"]); item.tab_descriptions = Some(vec!["c", "b1/c", "a/b1/c"]);
// item item
// }); });
// workspace.update(cx, |workspace, cx| { workspace.update(cx, |workspace, cx| {
// workspace.add_item(Box::new(item1.clone()), cx); workspace.add_item(Box::new(item1.clone()), cx);
// }); });
// item1.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), None)); item1.update(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(0)));
// // Adding an item that creates ambiguity increases the level of detail on // Adding an item that creates ambiguity increases the level of detail on
// // both tabs. // both tabs.
// let item2 = window.build_view(cx, |_| { let item2 = cx.build_view(|cx| {
// let mut item = TestItem::new(); let mut item = TestItem::new(cx);
// item.tab_descriptions = Some(vec!["c", "b2/c", "a/b2/c"]); item.tab_descriptions = Some(vec!["c", "b2/c", "a/b2/c"]);
// item item
// }); });
// workspace.update(cx, |workspace, cx| { workspace.update(cx, |workspace, cx| {
// workspace.add_item(Box::new(item2.clone()), cx); workspace.add_item(Box::new(item2.clone()), cx);
// }); });
// item1.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(1))); item1.update(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(1)));
// item2.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(1))); item2.update(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(1)));
// // Adding an item that creates ambiguity increases the level of detail only // Adding an item that creates ambiguity increases the level of detail only
// // on the ambiguous tabs. In this case, the ambiguity can't be resolved so // on the ambiguous tabs. In this case, the ambiguity can't be resolved so
// // we stop at the highest detail available. // we stop at the highest detail available.
// let item3 = window.build_view(cx, |_| { let item3 = cx.build_view(|cx| {
// let mut item = TestItem::new(); let mut item = TestItem::new(cx);
// item.tab_descriptions = Some(vec!["c", "b2/c", "a/b2/c"]); item.tab_descriptions = Some(vec!["c", "b2/c", "a/b2/c"]);
// item item
// }); });
// workspace.update(cx, |workspace, cx| { workspace.update(cx, |workspace, cx| {
// workspace.add_item(Box::new(item3.clone()), cx); workspace.add_item(Box::new(item3.clone()), cx);
// }); });
// item1.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(1))); item1.update(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(1)));
// item2.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(3))); item2.update(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(3)));
// item3.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(3))); item3.update(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(3)));
// } }
// #[gpui::test] // #[gpui::test]
// async fn test_tracking_active_path(cx: &mut TestAppContext) { // async fn test_tracking_active_path(cx: &mut TestAppContext) {
@ -4856,291 +4857,288 @@ fn parse_pixel_size_env_var(value: &str) -> Option<Size<GlobalPixels>> {
// }); // });
// } // }
// #[gpui::test] #[gpui::test]
// async fn test_prompting_to_save_only_on_last_item_for_entry(cx: &mut TestAppContext) { async fn test_prompting_to_save_only_on_last_item_for_entry(cx: &mut TestAppContext) {
// init_test(cx); init_test(cx);
// let fs = FakeFs::new(cx.background()); let fs = FakeFs::new(cx.executor());
let project = Project::test(fs, [], cx).await;
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
// let project = Project::test(fs, [], cx).await; // Create several workspace items with single project entries, and two
// let window = cx.add_window(|cx| Workspace::test_new(project, cx)); // workspace items with multiple project entries.
// let workspace = window.root(cx); let single_entry_items = (0..=4)
.map(|project_entry_id| {
cx.build_view(|cx| {
TestItem::new(cx)
.with_dirty(true)
.with_project_items(&[TestProjectItem::new(
project_entry_id,
&format!("{project_entry_id}.txt"),
cx,
)])
})
})
.collect::<Vec<_>>();
let item_2_3 = cx.build_view(|cx| {
TestItem::new(cx)
.with_dirty(true)
.with_singleton(false)
.with_project_items(&[
single_entry_items[2].read(cx).project_items[0].clone(),
single_entry_items[3].read(cx).project_items[0].clone(),
])
});
let item_3_4 = cx.build_view(|cx| {
TestItem::new(cx)
.with_dirty(true)
.with_singleton(false)
.with_project_items(&[
single_entry_items[3].read(cx).project_items[0].clone(),
single_entry_items[4].read(cx).project_items[0].clone(),
])
});
// // Create several workspace items with single project entries, and two // Create two panes that contain the following project entries:
// // workspace items with multiple project entries. // left pane:
// let single_entry_items = (0..=4) // multi-entry items: (2, 3)
// .map(|project_entry_id| { // single-entry items: 0, 1, 2, 3, 4
// window.build_view(cx, |cx| { // right pane:
// TestItem::new() // single-entry items: 1
// .with_dirty(true) // multi-entry items: (3, 4)
// .with_project_items(&[TestProjectItem::new( let left_pane = workspace.update(cx, |workspace, cx| {
// project_entry_id, let left_pane = workspace.active_pane().clone();
// &format!("{project_entry_id}.txt"), workspace.add_item(Box::new(item_2_3.clone()), cx);
// cx, for item in single_entry_items {
// )]) workspace.add_item(Box::new(item), cx);
// }) }
// }) left_pane.update(cx, |pane, cx| {
// .collect::<Vec<_>>(); pane.activate_item(2, true, true, cx);
// let item_2_3 = window.build_view(cx, |cx| { });
// TestItem::new()
// .with_dirty(true)
// .with_singleton(false)
// .with_project_items(&[
// single_entry_items[2].read(cx).project_items[0].clone(),
// single_entry_items[3].read(cx).project_items[0].clone(),
// ])
// });
// let item_3_4 = window.build_view(cx, |cx| {
// TestItem::new()
// .with_dirty(true)
// .with_singleton(false)
// .with_project_items(&[
// single_entry_items[3].read(cx).project_items[0].clone(),
// single_entry_items[4].read(cx).project_items[0].clone(),
// ])
// });
// // Create two panes that contain the following project entries: let right_pane = workspace
// // left pane: .split_and_clone(left_pane.clone(), SplitDirection::Right, cx)
// // multi-entry items: (2, 3) .unwrap();
// // single-entry items: 0, 1, 2, 3, 4
// // right pane:
// // single-entry items: 1
// // multi-entry items: (3, 4)
// let left_pane = workspace.update(cx, |workspace, cx| {
// let left_pane = workspace.active_pane().clone();
// workspace.add_item(Box::new(item_2_3.clone()), cx);
// for item in single_entry_items {
// workspace.add_item(Box::new(item), cx);
// }
// left_pane.update(cx, |pane, cx| {
// pane.activate_item(2, true, true, cx);
// });
// workspace right_pane.update(cx, |pane, cx| {
// .split_and_clone(left_pane.clone(), SplitDirection::Right, cx) pane.add_item(Box::new(item_3_4.clone()), true, true, None, cx);
// .unwrap(); });
// left_pane left_pane
// }); });
// //Need to cause an effect flush in order to respect new focus cx.focus_view(&left_pane);
// workspace.update(cx, |workspace, cx| {
// workspace.add_item(Box::new(item_3_4.clone()), cx);
// cx.focus(&left_pane);
// });
// // When closing all of the items in the left pane, we should be prompted twice: // When closing all of the items in the left pane, we should be prompted twice:
// // once for project entry 0, and once for project entry 2. After those two // once for project entry 0, and once for project entry 2. Project entries 1,
// // prompts, the task should complete. // 3, and 4 are all still open in the other paten. After those two
// prompts, the task should complete.
// let close = left_pane.update(cx, |pane, cx| { let close = left_pane.update(cx, |pane, cx| {
// pane.close_items(cx, SaveIntent::Close, move |_| true) pane.close_all_items(&CloseAllItems::default(), cx).unwrap()
// }); });
// cx.foreground().run_until_parked(); cx.executor().run_until_parked();
// // Discard "Save all" prompt
// window.simulate_prompt_answer(2, cx);
// cx.foreground().run_until_parked(); // Discard "Save all" prompt
// left_pane.read_with(cx, |pane, cx| { cx.simulate_prompt_answer(2);
// assert_eq!(
// pane.active_item().unwrap().project_entry_ids(cx).as_slice(),
// &[ProjectEntryId::from_proto(0)]
// );
// });
// window.simulate_prompt_answer(0, cx);
// cx.foreground().run_until_parked(); cx.executor().run_until_parked();
// left_pane.read_with(cx, |pane, cx| { left_pane.update(cx, |pane, cx| {
// assert_eq!( assert_eq!(
// pane.active_item().unwrap().project_entry_ids(cx).as_slice(), pane.active_item().unwrap().project_entry_ids(cx).as_slice(),
// &[ProjectEntryId::from_proto(2)] &[ProjectEntryId::from_proto(0)]
// ); );
// }); });
// window.simulate_prompt_answer(0, cx); cx.simulate_prompt_answer(0);
// cx.foreground().run_until_parked(); cx.executor().run_until_parked();
// close.await.unwrap(); left_pane.update(cx, |pane, cx| {
// left_pane.read_with(cx, |pane, _| { assert_eq!(
// assert_eq!(pane.items_len(), 0); pane.active_item().unwrap().project_entry_ids(cx).as_slice(),
// }); &[ProjectEntryId::from_proto(2)]
// } );
});
cx.simulate_prompt_answer(0);
// #[gpui::test] cx.executor().run_until_parked();
// async fn test_autosave(deterministic: Arc<Deterministic>, cx: &mut gpui::TestAppContext) { close.await.unwrap();
// init_test(cx); left_pane.update(cx, |pane, _| {
assert_eq!(pane.items_len(), 0);
});
}
// let fs = FakeFs::new(cx.background()); #[gpui::test]
async fn test_autosave(cx: &mut gpui::TestAppContext) {
init_test(cx);
// let project = Project::test(fs, [], cx).await; let fs = FakeFs::new(cx.executor());
// let window = cx.add_window(|cx| Workspace::test_new(project, cx)); let project = Project::test(fs, [], cx).await;
// let workspace = window.root(cx); let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
// let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone()); let pane = workspace.update(cx, |workspace, _| workspace.active_pane().clone());
// let item = window.build_view(cx, |cx| { let item = cx.build_view(|cx| {
// TestItem::new().with_project_items(&[TestProjectItem::new(1, "1.txt", cx)]) TestItem::new(cx).with_project_items(&[TestProjectItem::new(1, "1.txt", cx)])
// }); });
// let item_id = item.id(); let item_id = item.entity_id();
// workspace.update(cx, |workspace, cx| { workspace.update(cx, |workspace, cx| {
// workspace.add_item(Box::new(item.clone()), cx); workspace.add_item(Box::new(item.clone()), cx);
// }); });
// // Autosave on window change. // Autosave on window change.
// item.update(cx, |item, cx| { item.update(cx, |item, cx| {
// cx.update_global(|settings: &mut SettingsStore, cx| { cx.update_global(|settings: &mut SettingsStore, cx| {
// settings.update_user_settings::<WorkspaceSettings>(cx, |settings| { settings.update_user_settings::<WorkspaceSettings>(cx, |settings| {
// settings.autosave = Some(AutosaveSetting::OnWindowChange); settings.autosave = Some(AutosaveSetting::OnWindowChange);
// }) })
// }); });
// item.is_dirty = true; item.is_dirty = true;
// }); });
// // Deactivating the window saves the file. // Deactivating the window saves the file.
// window.simulate_deactivation(cx); cx.simulate_deactivation();
// deterministic.run_until_parked(); cx.executor().run_until_parked();
// item.read_with(cx, |item, _| assert_eq!(item.save_count, 1)); item.update(cx, |item, _| assert_eq!(item.save_count, 1));
// // Autosave on focus change. // Autosave on focus change.
// item.update(cx, |item, cx| { item.update(cx, |item, cx| {
// cx.focus_self(); cx.focus_self();
// cx.update_global(|settings: &mut SettingsStore, cx| { cx.update_global(|settings: &mut SettingsStore, cx| {
// settings.update_user_settings::<WorkspaceSettings>(cx, |settings| { settings.update_user_settings::<WorkspaceSettings>(cx, |settings| {
// settings.autosave = Some(AutosaveSetting::OnFocusChange); settings.autosave = Some(AutosaveSetting::OnFocusChange);
// }) })
// }); });
// item.is_dirty = true; item.is_dirty = true;
// }); });
// // Blurring the item saves the file. // Blurring the item saves the file.
// item.update(cx, |_, cx| cx.blur()); item.update(cx, |_, cx| cx.blur());
// deterministic.run_until_parked(); cx.executor().run_until_parked();
// item.read_with(cx, |item, _| assert_eq!(item.save_count, 2)); item.update(cx, |item, _| assert_eq!(item.save_count, 2));
// // Deactivating the window still saves the file. // Deactivating the window still saves the file.
// window.simulate_activation(cx); cx.simulate_activation();
// item.update(cx, |item, cx| { item.update(cx, |item, cx| {
// cx.focus_self(); cx.focus_self();
// item.is_dirty = true; item.is_dirty = true;
// }); });
// window.simulate_deactivation(cx); cx.simulate_deactivation();
// deterministic.run_until_parked(); cx.executor().run_until_parked();
// item.read_with(cx, |item, _| assert_eq!(item.save_count, 3)); item.update(cx, |item, _| assert_eq!(item.save_count, 3));
// // Autosave after delay. // Autosave after delay.
// item.update(cx, |item, cx| { item.update(cx, |item, cx| {
// cx.update_global(|settings: &mut SettingsStore, cx| { cx.update_global(|settings: &mut SettingsStore, cx| {
// settings.update_user_settings::<WorkspaceSettings>(cx, |settings| { settings.update_user_settings::<WorkspaceSettings>(cx, |settings| {
// settings.autosave = Some(AutosaveSetting::AfterDelay { milliseconds: 500 }); settings.autosave = Some(AutosaveSetting::AfterDelay { milliseconds: 500 });
// }) })
// }); });
// item.is_dirty = true; item.is_dirty = true;
// cx.emit(TestItemEvent::Edit); cx.emit(ItemEvent::Edit);
// }); });
// // Delay hasn't fully expired, so the file is still dirty and unsaved. // Delay hasn't fully expired, so the file is still dirty and unsaved.
// deterministic.advance_clock(Duration::from_millis(250)); cx.executor().advance_clock(Duration::from_millis(250));
// item.read_with(cx, |item, _| assert_eq!(item.save_count, 3)); item.update(cx, |item, _| assert_eq!(item.save_count, 3));
// // After delay expires, the file is saved. // After delay expires, the file is saved.
// deterministic.advance_clock(Duration::from_millis(250)); cx.executor().advance_clock(Duration::from_millis(250));
// item.read_with(cx, |item, _| assert_eq!(item.save_count, 4)); item.update(cx, |item, _| assert_eq!(item.save_count, 4));
// // Autosave on focus change, ensuring closing the tab counts as such. // Autosave on focus change, ensuring closing the tab counts as such.
// item.update(cx, |item, cx| { item.update(cx, |item, cx| {
// cx.update_global(|settings: &mut SettingsStore, cx| { cx.update_global(|settings: &mut SettingsStore, cx| {
// settings.update_user_settings::<WorkspaceSettings>(cx, |settings| { settings.update_user_settings::<WorkspaceSettings>(cx, |settings| {
// settings.autosave = Some(AutosaveSetting::OnFocusChange); settings.autosave = Some(AutosaveSetting::OnFocusChange);
// }) })
// }); });
// item.is_dirty = true; item.is_dirty = true;
// }); });
// pane.update(cx, |pane, cx| { pane.update(cx, |pane, cx| {
// pane.close_items(cx, SaveIntent::Close, move |id| id == item_id) pane.close_items(cx, SaveIntent::Close, move |id| id == item_id)
// }) })
// .await .await
// .unwrap(); .unwrap();
// assert!(!window.has_pending_prompt(cx)); assert!(!cx.has_pending_prompt());
// item.read_with(cx, |item, _| assert_eq!(item.save_count, 5)); item.update(cx, |item, _| assert_eq!(item.save_count, 5));
// // Add the item again, ensuring autosave is prevented if the underlying file has been deleted. // Add the item again, ensuring autosave is prevented if the underlying file has been deleted.
// workspace.update(cx, |workspace, cx| { workspace.update(cx, |workspace, cx| {
// workspace.add_item(Box::new(item.clone()), cx); workspace.add_item(Box::new(item.clone()), cx);
// }); });
// item.update(cx, |item, cx| { item.update(cx, |item, cx| {
// item.project_items[0].update(cx, |item, _| { item.project_items[0].update(cx, |item, _| {
// item.entry_id = None; item.entry_id = None;
// }); });
// item.is_dirty = true; item.is_dirty = true;
// cx.blur(); cx.blur();
// }); });
// deterministic.run_until_parked(); cx.executor().run_until_parked();
// item.read_with(cx, |item, _| assert_eq!(item.save_count, 5)); item.update(cx, |item, _| assert_eq!(item.save_count, 5));
// // Ensure autosave is prevented for deleted files also when closing the buffer. // Ensure autosave is prevented for deleted files also when closing the buffer.
// let _close_items = pane.update(cx, |pane, cx| { let _close_items = pane.update(cx, |pane, cx| {
// pane.close_items(cx, SaveIntent::Close, move |id| id == item_id) pane.close_items(cx, SaveIntent::Close, move |id| id == item_id)
// }); });
// deterministic.run_until_parked(); cx.executor().run_until_parked();
// assert!(window.has_pending_prompt(cx)); assert!(cx.has_pending_prompt());
// item.read_with(cx, |item, _| assert_eq!(item.save_count, 5)); item.update(cx, |item, _| assert_eq!(item.save_count, 5));
// } }
// #[gpui::test] #[gpui::test]
// async fn test_pane_navigation(cx: &mut gpui::TestAppContext) { async fn test_pane_navigation(cx: &mut gpui::TestAppContext) {
// init_test(cx); init_test(cx);
// let fs = FakeFs::new(cx.background()); let fs = FakeFs::new(cx.executor());
// let project = Project::test(fs, [], cx).await; let project = Project::test(fs, [], cx).await;
// let window = cx.add_window(|cx| Workspace::test_new(project, cx)); let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
// let workspace = window.root(cx);
// let item = window.build_view(cx, |cx| { let item = cx.build_view(|cx| {
// TestItem::new().with_project_items(&[TestProjectItem::new(1, "1.txt", cx)]) TestItem::new(cx).with_project_items(&[TestProjectItem::new(1, "1.txt", cx)])
// }); });
// let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone()); let pane = workspace.update(cx, |workspace, _| workspace.active_pane().clone());
// let toolbar = pane.read_with(cx, |pane, _| pane.toolbar().clone()); let toolbar = pane.update(cx, |pane, _| pane.toolbar().clone());
// let toolbar_notify_count = Rc::new(RefCell::new(0)); let toolbar_notify_count = Rc::new(RefCell::new(0));
// workspace.update(cx, |workspace, cx| { workspace.update(cx, |workspace, cx| {
// workspace.add_item(Box::new(item.clone()), cx); workspace.add_item(Box::new(item.clone()), cx);
// let toolbar_notification_count = toolbar_notify_count.clone(); let toolbar_notification_count = toolbar_notify_count.clone();
// cx.observe(&toolbar, move |_, _, _| { cx.observe(&toolbar, move |_, _, _| {
// *toolbar_notification_count.borrow_mut() += 1 *toolbar_notification_count.borrow_mut() += 1
// }) })
// .detach(); .detach();
// }); });
// pane.read_with(cx, |pane, _| { pane.update(cx, |pane, _| {
// assert!(!pane.can_navigate_backward()); assert!(!pane.can_navigate_backward());
// assert!(!pane.can_navigate_forward()); assert!(!pane.can_navigate_forward());
// }); });
// item.update(cx, |item, cx| { item.update(cx, |item, cx| {
// item.set_state("one".to_string(), cx); item.set_state("one".to_string(), cx);
// }); });
// // Toolbar must be notified to re-render the navigation buttons // Toolbar must be notified to re-render the navigation buttons
// assert_eq!(*toolbar_notify_count.borrow(), 1); assert_eq!(*toolbar_notify_count.borrow(), 1);
// pane.read_with(cx, |pane, _| { pane.update(cx, |pane, _| {
// assert!(pane.can_navigate_backward()); assert!(pane.can_navigate_backward());
// assert!(!pane.can_navigate_forward()); assert!(!pane.can_navigate_forward());
// }); });
// workspace workspace
// .update(cx, |workspace, cx| workspace.go_back(pane.downgrade(), cx)) .update(cx, |workspace, cx| workspace.go_back(pane.downgrade(), cx))
// .await .await
// .unwrap(); .unwrap();
// assert_eq!(*toolbar_notify_count.borrow(), 3); assert_eq!(*toolbar_notify_count.borrow(), 2);
// pane.read_with(cx, |pane, _| { pane.update(cx, |pane, _| {
// assert!(!pane.can_navigate_backward()); assert!(!pane.can_navigate_backward());
// assert!(pane.can_navigate_forward()); assert!(pane.can_navigate_forward());
// }); });
// } }
// #[gpui::test] // #[gpui::test]
// async fn test_toggle_docks_and_panels(cx: &mut gpui::TestAppContext) { // async fn test_toggle_docks_and_panels(cx: &mut gpui::TestAppContext) {
@ -5500,14 +5498,14 @@ fn parse_pixel_size_env_var(value: &str) -> Option<Size<GlobalPixels>> {
// }); // });
// } // }
// pub fn init_test(cx: &mut TestAppContext) { pub fn init_test(cx: &mut TestAppContext) {
// cx.foreground().forbid_parking(); cx.update(|cx| {
// cx.update(|cx| { let settings_store = SettingsStore::test(cx);
// cx.set_global(SettingsStore::test(cx)); cx.set_global(settings_store);
// theme::init((), cx); theme::init(theme::LoadThemes::JustBase, cx);
// language::init(cx); language::init(cx);
// crate::init_settings(cx); crate::init_settings(cx);
// Project::init_settings(cx); Project::init_settings(cx);
// }); });
// } }
// } }

2
crates/workspace2/src/workspace_settings.rs
View file

@ -1,6 +1,6 @@
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use settings2::Settings; use settings::Settings;
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct WorkspaceSettings { pub struct WorkspaceSettings {