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

wip

Browse source
This commit is contained in:
KCaverly 2023-10-31 12:00:45 -04:00
parent 551171a339
commit fed391fe6b
3 changed files with 181 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,15 +14,18 @@ use anyhow::{anyhow, Result};
use call2::ActiveCall; use call2::ActiveCall;
use client2::{ use client2::{
proto::{self, PeerId}, proto::{self, PeerId},
Client, UserStore, Client, TypedEnvelope, UserStore,
}; };
use collections::{HashMap, HashSet}; use collections::{HashMap, HashSet};
use dock::Dock; use dock::Dock;
use futures::{channel::oneshot, FutureExt}; use futures::{
channel::{mpsc, oneshot},
FutureExt,
};
use gpui2::{ use gpui2::{
AnyModel, AnyView, AppContext, AsyncAppContext, DisplayId, EventEmitter, MainThread, Model, AnyModel, AnyView, AppContext, AsyncAppContext, AsyncWindowContext, DisplayId, EventEmitter,
Subscription, Task, View, ViewContext, VisualContext, WeakModel, WeakView, WindowBounds, MainThread, Model, ModelContext, Subscription, Task, View, ViewContext, VisualContext,
WindowHandle, WindowOptions, WeakModel, WeakView, WindowBounds, WindowHandle, WindowOptions,
}; };
use item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ProjectItem}; use item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ProjectItem};
use language2::LanguageRegistry; use language2::LanguageRegistry;
@ -418,7 +421,7 @@ pub struct AppState {
} }
pub struct WorkspaceStore { pub struct WorkspaceStore {
workspaces: HashSet<WeakModel<Workspace>>, workspaces: HashSet<WeakView<Workspace>>,
followers: Vec<Follower>, followers: Vec<Follower>,
client: Arc<Client>, client: Arc<Client>,
_subscriptions: Vec<client2::Subscription>, _subscriptions: Vec<client2::Subscription>,
@ -539,7 +542,7 @@ pub struct Workspace {
last_leaders_by_pane: HashMap<WeakView<Pane>, PeerId>, last_leaders_by_pane: HashMap<WeakView<Pane>, PeerId>,
// window_edited: bool, // window_edited: bool,
active_call: Option<(Model<ActiveCall>, Vec<Subscription>)>, active_call: Option<(Model<ActiveCall>, Vec<Subscription>)>,
// leader_updates_tx: mpsc::UnboundedSender<(PeerId, proto::UpdateFollowers)>, leader_updates_tx: mpsc::UnboundedSender<(PeerId, proto::UpdateFollowers)>,
database_id: WorkspaceId, database_id: WorkspaceId,
app_state: Arc<AppState>, app_state: Arc<AppState>,
// subscriptions: Vec<Subscription>, // subscriptions: Vec<Subscription>,
@ -2853,16 +2856,16 @@ impl Workspace {
// } // }
// } // }
// fn handle_update_followers( fn handle_update_followers(
// &mut self, &mut self,
// leader_id: PeerId, leader_id: PeerId,
// message: proto::UpdateFollowers, message: proto::UpdateFollowers,
// _cx: &mut ViewContext<Self>, _cx: &mut ViewContext<Self>,
// ) { ) {
// self.leader_updates_tx self.leader_updates_tx
// .unbounded_send((leader_id, message)) .unbounded_send((leader_id, message))
// .ok(); .ok();
// } }
// async fn process_leader_update( // async fn process_leader_update(
// this: &WeakView<Self>, // this: &WeakView<Self>,
@ -3886,18 +3889,19 @@ impl EventEmitter for Workspace {
// } // }
impl WorkspaceStore { impl WorkspaceStore {
// pub fn new(client: Arc<Client>, cx: &mut ModelContext<Self>) -> Self { pub fn new(client: Arc<Client>, cx: &mut ModelContext<Self>) -> Self {
// Self { // Self {
// workspaces: Default::default(), // workspaces: Default::default(),
// followers: Default::default(), // followers: Default::default(),
// _subscriptions: vec![ // _subscriptions: vec![
// client.add_request_handler(cx.handle(), Self::handle_follow), // client.add_request_handler(cx.weak_model(), Self::handle_follow),
// client.add_message_handler(cx.handle(), Self::handle_unfollow), // client.add_message_handler(cx.weak_model(), Self::handle_unfollow),
// client.add_message_handler(cx.handle(), Self::handle_update_followers), // client.add_message_handler(cx.weak_model(), Self::handle_update_followers),
// ], // ],
// client, // client,
// } // }
// } todo!()
}
pub fn update_followers( pub fn update_followers(
&self, &self,
@ -3933,100 +3937,101 @@ impl WorkspaceStore {
}) })
.log_err() .log_err()
} }
// async fn handle_follow(
// this: Model<Self>,
// envelope: TypedEnvelope<proto::Follow>,
// _: Arc<Client>,
// mut cx: AsyncAppContext,
// ) -> Result<proto::FollowResponse> {
// this.update(&mut cx, |this, cx| {
// let follower = Follower {
// project_id: envelope.payload.project_id,
// peer_id: envelope.original_sender_id()?,
// };
// let active_project = ActiveCall::global(cx)
// .read(cx)
// .location()
// .map(|project| project.id());
// let mut response = proto::FollowResponse::default();
// for workspace in &this.workspaces {
// let Some(workspace) = workspace.upgrade(cx) else {
// continue;
// };
// workspace.update(cx.as_mut(), |workspace, cx| {
// let handler_response = workspace.handle_follow(follower.project_id, cx);
// if response.views.is_empty() {
// response.views = handler_response.views;
// } else {
// response.views.extend_from_slice(&handler_response.views);
// }
// if let Some(active_view_id) = handler_response.active_view_id.clone() {
// if response.active_view_id.is_none()
// || Some(workspace.project.id()) == active_project
// {
// response.active_view_id = Some(active_view_id);
// }
// }
// });
// }
// if let Err(ix) = this.followers.binary_search(&follower) {
// this.followers.insert(ix, follower);
// }
// Ok(response)
// })
// }
async fn handle_unfollow(
model: Model<Self>,
envelope: TypedEnvelope<proto::Unfollow>,
_: Arc<Client>,
mut cx: AsyncAppContext,
) -> Result<()> {
model.update(&mut cx, |this, _| {
let follower = Follower {
project_id: envelope.payload.project_id,
peer_id: envelope.original_sender_id()?,
};
if let Ok(ix) = this.followers.binary_search(&follower) {
this.followers.remove(ix);
}
Ok(())
})?
}
async fn handle_update_followers(
this: Model<Self>,
envelope: TypedEnvelope<proto::UpdateFollowers>,
_: Arc<Client>,
mut cx: AsyncWindowContext,
) -> Result<()> {
// let leader_id = envelope.original_sender_id()?;
// let update = envelope.payload;
// this.update(&mut cx, |this, cx| {
// for workspace in &this.workspaces {
// let Some(workspace) = workspace.upgrade() else {
// continue;
// };
// workspace.update(cx, |workspace, cx| {
// let project_id = workspace.project.read(cx).remote_id();
// if update.project_id != project_id && update.project_id.is_some() {
// return;
// }
// workspace.handle_update_followers(leader_id, update.clone(), cx);
// });
// }
// Ok(())
// })?
todo!()
}
} }
// async fn handle_follow(
// this: ModelHandle<Self>,
// envelope: TypedEnvelope<proto::Follow>,
// _: Arc<Client>,
// mut cx: AsyncAppContext,
// ) -> Result<proto::FollowResponse> {
// this.update(&mut cx, |this, cx| {
// let follower = Follower {
// project_id: envelope.payload.project_id,
// peer_id: envelope.original_sender_id()?,
// };
// let active_project = ActiveCall::global(cx)
// .read(cx)
// .location()
// .map(|project| project.id());
// let mut response = proto::FollowResponse::default();
// for workspace in &this.workspaces {
// let Some(workspace) = workspace.upgrade(cx) else {
// continue;
// };
// workspace.update(cx.as_mut(), |workspace, cx| {
// let handler_response = workspace.handle_follow(follower.project_id, cx);
// if response.views.is_empty() {
// response.views = handler_response.views;
// } else {
// response.views.extend_from_slice(&handler_response.views);
// }
// if let Some(active_view_id) = handler_response.active_view_id.clone() {
// if response.active_view_id.is_none()
// || Some(workspace.project.id()) == active_project
// {
// response.active_view_id = Some(active_view_id);
// }
// }
// });
// }
// if let Err(ix) = this.followers.binary_search(&follower) {
// this.followers.insert(ix, follower);
// }
// Ok(response)
// })
// }
// async fn handle_unfollow(
// this: ModelHandle<Self>,
// envelope: TypedEnvelope<proto::Unfollow>,
// _: Arc<Client>,
// mut cx: AsyncAppContext,
// ) -> Result<()> {
// this.update(&mut cx, |this, _| {
// let follower = Follower {
// project_id: envelope.payload.project_id,
// peer_id: envelope.original_sender_id()?,
// };
// if let Ok(ix) = this.followers.binary_search(&follower) {
// this.followers.remove(ix);
// }
// Ok(())
// })
// }
// async fn handle_update_followers(
// this: ModelHandle<Self>,
// envelope: TypedEnvelope<proto::UpdateFollowers>,
// _: Arc<Client>,
// mut cx: AsyncAppContext,
// ) -> Result<()> {
// let leader_id = envelope.original_sender_id()?;
// let update = envelope.payload;
// this.update(&mut cx, |this, cx| {
// for workspace in &this.workspaces {
// let Some(workspace) = workspace.upgrade(cx) else {
// continue;
// };
// workspace.update(cx.as_mut(), |workspace, cx| {
// let project_id = workspace.project.read(cx).remote_id();
// if update.project_id != project_id && update.project_id.is_some() {
// return;
// }
// workspace.handle_update_followers(leader_id, update.clone(), cx);
// });
// }
// Ok(())
// })
// }
// }
// impl Entity for WorkspaceStore { // impl Entity for WorkspaceStore {
// type Event = (); // type Event = ();
// } // }
@ -4320,7 +4325,7 @@ pub fn open_paths(
.await; .await;
if let Some(existing) = existing { if let Some(existing) = existing {
// Ok(( // // Ok((
// existing.clone(), // existing.clone(),
// cx.update_window_root(&existing, |workspace, cx| { // cx.update_window_root(&existing, |workspace, cx| {
// workspace.open_paths(abs_paths, true, cx) // workspace.open_paths(abs_paths, true, cx)

50
crates/zed2/src/main.rs
View file

@ -12,7 +12,7 @@ use client2::UserStore;
use db2::kvp::KEY_VALUE_STORE; use db2::kvp::KEY_VALUE_STORE;
use fs2::RealFs; use fs2::RealFs;
use futures::{channel::mpsc, SinkExt, StreamExt}; use futures::{channel::mpsc, SinkExt, StreamExt};
use gpui2::{App, AppContext, AsyncAppContext, Context, SemanticVersion, Task}; use gpui2::{Action, App, AppContext, AsyncAppContext, Context, SemanticVersion, Task};
use isahc::{prelude::Configurable, Request}; use isahc::{prelude::Configurable, Request};
use language2::LanguageRegistry; use language2::LanguageRegistry;
use log::LevelFilter; use log::LevelFilter;
@ -45,7 +45,7 @@ use util::{
paths, ResultExt, paths, ResultExt,
}; };
use uuid::Uuid; use uuid::Uuid;
use workspace2::AppState; use workspace2::{AppState, WorkspaceStore};
use zed2::languages; use zed2::languages;
use zed2::{ensure_only_instance, Assets, IsOnlyInstance}; use zed2::{ensure_only_instance, Assets, IsOnlyInstance};
@ -120,7 +120,7 @@ fn main() {
language2::init(cx); language2::init(cx);
languages::init(languages.clone(), node_runtime.clone(), cx); languages::init(languages.clone(), node_runtime.clone(), cx);
let user_store = cx.build_model(|cx| UserStore::new(client.clone(), http.clone(), cx)); let user_store = cx.build_model(|cx| UserStore::new(client.clone(), http.clone(), cx));
// let workspace_store = cx.add_model(|cx| WorkspaceStore::new(client.clone(), cx)); let workspace_store = cx.build_model(|cx| WorkspaceStore::new(client.clone(), cx));
cx.set_global(client.clone()); cx.set_global(client.clone());
@ -165,20 +165,18 @@ fn main() {
// client.telemetry().start(installation_id, session_id, cx); // client.telemetry().start(installation_id, session_id, cx);
// todo!("app_state") let app_state = Arc::new(AppState {
let app_state: Arc<AppState> = todo!(); languages,
// let app_state = Arc::new(AppState { client: client.clone(),
// languages, user_store,
// client: client.clone(), fs,
// user_store, build_window_options,
// fs, initialize_workspace,
// build_window_options, background_actions,
// initialize_workspace, workspace_store,
// background_actions, node_runtime,
// workspace_store, });
// node_runtime, cx.set_global(Arc::downgrade(&app_state));
// });
// cx.set_global(Arc::downgrade(&app_state));
// audio::init(Assets, cx); // audio::init(Assets, cx);
// auto_update::init(http.clone(), client::ZED_SERVER_URL.clone(), cx); // auto_update::init(http.clone(), client::ZED_SERVER_URL.clone(), cx);
@ -914,11 +912,13 @@ async fn handle_cli_connection(
} }
} }
// pub fn background_actions() -> &'static [(&'static str, &'static dyn Action)] { pub fn background_actions() -> &'static [(&'static str, &'static dyn Action)] {
// &[ // &[
// ("Go to file", &file_finder::Toggle), // ("Go to file", &file_finder::Toggle),
// ("Open command palette", &command_palette::Toggle), // ("Open command palette", &command_palette::Toggle),
// ("Open recent projects", &recent_projects::OpenRecent), // ("Open recent projects", &recent_projects::OpenRecent),
// ("Change your settings", &zed_actions::OpenSettings), // ("Change your settings", &zed_actions::OpenSettings),
// ] // ]
// } // todo!()
&[]
}

30
crates/zed2/src/zed2.rs
View file

@ -5,7 +5,10 @@ mod open_listener;
pub use assets::*; pub use assets::*;
use collections::HashMap; use collections::HashMap;
use gpui2::{AsyncAppContext, Point}; use gpui2::{
point, px, AsyncAppContext, Point, Styled, TitlebarOptions, WindowBounds, WindowKind,
WindowOptions,
};
pub use only_instance::*; pub use only_instance::*;
pub use open_listener::*; pub use open_listener::*;
@ -20,6 +23,7 @@ use futures::{
}; };
use std::{path::Path, sync::Arc, thread, time::Duration}; use std::{path::Path, sync::Arc, thread, time::Duration};
use util::{paths::PathLikeWithPosition, ResultExt}; use util::{paths::PathLikeWithPosition, ResultExt};
use uuid::Uuid;
use workspace2::AppState; use workspace2::AppState;
pub fn connect_to_cli( pub fn connect_to_cli(
@ -211,3 +215,27 @@ pub async fn handle_cli_connection(
} }
} }
} }
pub fn build_window_options(
bounds: Option<WindowBounds>,
display: Option<Uuid>,
platform: &dyn Platform,
) -> WindowOptions {
let bounds = bounds.unwrap_or(WindowBounds::Maximized);
let display_id = display.and_then(|display| platform.screen_by_id(display));
WindowOptions {
bounds,
titlebar: Some(TitlebarOptions {
title: None,
appears_transparent: true,
traffic_light_position: Some(point(px(8.), px(8.))),
}),
center: false,
focus: false,
show: false,
kind: WindowKind::Normal,
is_movable: false,
display_id,
}
}