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

Merge branch 'zed2' into zed2-workspace

Browse source
This commit is contained in:
Mikayla 2023-10-30 16:53:21 -07:00
commit 3dadfb8ba8
No known key found for this signature in database
185 changed files with 12176 additions and 4816 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ mod open_listener;
pub use assets::*;
use client2::{Client, UserStore};
use collections::HashMap;
use gpui2::{AsyncAppContext, Handle, Point};
use gpui2::{AsyncAppContext, Model};
pub use only_instance::*;
pub use open_listener::*;
@ -52,7 +52,7 @@ pub fn connect_to_cli(
pub struct AppState {
pub client: Arc<Client>,
pub user_store: Handle<UserStore>,
pub user_store: Model<UserStore>,
}
pub async fn handle_cli_connection(