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

rebase fix - almost have serialize_workspace piped to the workspace constructor. Just a few compile errors left

Browse source
This commit is contained in:
K Simmons 2022-10-21 00:09:09 -07:00 • committed by Mikayla Maki
parent 73f0459a0f
commit e5c6393f85
3 changed files with 106 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/zed/src/zed.rs
View file

@ -463,7 +463,7 @@ fn open_config_file(
workspace
.update(&mut cx, |workspace, cx| {
workspace.with_local_workspace(cx, app_state, |workspace, cx| {
workspace.with_local_workspace(app_state, cx, |workspace, cx| {
workspace.open_paths(vec![path.to_path_buf()], false, cx)
})
})
@ -480,7 +480,7 @@ fn open_log_file(
) {
const MAX_LINES: usize = 1000;
workspace.with_local_workspace(cx, app_state.clone(), |_, cx| {
workspace.with_local_workspace(app_state.clone(), cx, |_, cx| {
cx.spawn_weak(|workspace, mut cx| async move {
let (old_log, new_log) = futures::join!(
app_state.fs.load(&paths::OLD_LOG),
@ -532,7 +532,7 @@ fn open_telemetry_log_file(
app_state: Arc<AppState>,
cx: &mut ViewContext<Workspace>,
) {
workspace.with_local_workspace(cx, app_state.clone(), |_, cx| {
workspace.with_local_workspace(app_state.clone(), cx, |_, cx| {
cx.spawn_weak(|workspace, mut cx| async move {
let workspace = workspace.upgrade(&cx)?;
let path = app_state.client.telemetry_log_file_path()?;