Move to using stateless

This commit is contained in:
Mikayla Maki
2023-03-06 14:26:31 -08:00
parent 118435a348
commit 7d7053b990
6 changed files with 40 additions and 6 deletions
+11 -3
View File
@@ -13,6 +13,7 @@ use client::{
http::{self, HttpClient},
UserStore, ZED_APP_VERSION, ZED_SECRET_CLIENT_TOKEN,
};
use db::kvp::KEY_VALUE_STORE;
use futures::{
channel::{mpsc, oneshot},
FutureExt, SinkExt, StreamExt,
@@ -43,9 +44,12 @@ use theme::ThemeRegistry;
use util::StaffMode;
use util::{channel::RELEASE_CHANNEL, paths, ResultExt, TryFutureExt};
use workspace::{
self, item::ItemHandle, notifications::NotifyResultExt, AppState, OpenPaths, Welcome, Workspace,
self, item::ItemHandle, notifications::NotifyResultExt, AppState, NewFile, OpenPaths, Workspace,
};
use zed::{
self, build_window_options, initialize_workspace, languages, menus, WelcomeExperience,
FIRST_OPEN,
};
use zed::{self, build_window_options, initialize_workspace, languages, menus};
fn main() {
let http = http::client();
@@ -258,9 +262,13 @@ async fn restore_or_create_workspace(mut cx: AsyncAppContext) {
paths: location.paths().as_ref().clone(),
})
});
} else if matches!(KEY_VALUE_STORE.read_kvp(FIRST_OPEN), Ok(None)) {
cx.update(|cx| {
cx.dispatch_global_action(WelcomeExperience);
});
} else {
cx.update(|cx| {
cx.dispatch_global_action(Welcome);
cx.dispatch_global_action(NewFile);
});
}
}
+24 -1
View File
@@ -8,6 +8,7 @@ use breadcrumbs::Breadcrumbs;
pub use client;
use collab_ui::{CollabTitlebarItem, ToggleContactsMenu};
use collections::VecDeque;
use db::kvp::KEY_VALUE_STORE;
pub use editor;
use editor::{Editor, MultiBuffer};
@@ -34,7 +35,9 @@ use std::{borrow::Cow, env, path::Path, str, sync::Arc};
use util::{channel::ReleaseChannel, paths, ResultExt, StaffMode};
use uuid::Uuid;
pub use workspace;
use workspace::{sidebar::SidebarSide, AppState, Restart, Workspace};
use workspace::{sidebar::SidebarSide, AppState, Restart, Welcome, Workspace};
pub const FIRST_OPEN: &str = "first_open";
#[derive(Deserialize, Clone, PartialEq)]
pub struct OpenBrowser {
@@ -67,6 +70,7 @@ actions!(
ResetBufferFontSize,
InstallCommandLineInterface,
ResetDatabase,
WelcomeExperience
]
);
@@ -252,6 +256,25 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::MutableAppContext) {
},
);
cx.add_global_action(|_: &WelcomeExperience, cx| {
if !matches!(KEY_VALUE_STORE.read_kvp(FIRST_OPEN), Ok(None)) {
return; //noop, in case someone fires this from the command palette
}
// Make a workspace, set it up with an open bottom dock and the welcome page
cx.dispatch_global_action(Welcome);
cx.background()
.spawn(async move {
KEY_VALUE_STORE
.write_kvp(FIRST_OPEN.to_string(), "false".to_string())
.await
.log_err();
})
.detach();
});
activity_indicator::init(cx);
call::init(app_state.client.clone(), app_state.user_store.clone(), cx);
settings::KeymapFileContent::load_defaults(cx);