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

Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace

Browse source
This commit is contained in:
KCaverly 2023-10-31 11:39:34 -04:00
commit 551171a339
13 changed files with 277 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,8 +45,9 @@ use util::{
paths, ResultExt,
};
use uuid::Uuid;
use workspace2::AppState;
use zed2::languages;
use zed2::{ensure_only_instance, AppState, Assets, IsOnlyInstance};
use zed2::{ensure_only_instance, Assets, IsOnlyInstance};
mod open_listener;
@ -165,7 +166,7 @@ fn main() {
// client.telemetry().start(installation_id, session_id, cx);
// todo!("app_state")
let app_state = Arc::new(AppState { client, user_store });
let app_state: Arc<AppState> = todo!();
// let app_state = Arc::new(AppState {
// languages,
// client: client.clone(),