From 68a1c7ce4cbf5bbe4e16d4811cd2a605c7559117 Mon Sep 17 00:00:00 2001 From: KCaverly Date: Tue, 31 Oct 2023 11:32:56 -0400 Subject: [PATCH] wip --- crates/gpui2/src/app.rs | 6 +- crates/gpui2/src/platform.rs | 10 +- crates/gpui2/src/window.rs | 2 +- crates/workspace2/src/item.rs | 4 +- crates/zed2/src/zed2.rs | 199 +++++++++++++++++----------------- 5 files changed, 110 insertions(+), 111 deletions(-) diff --git a/crates/gpui2/src/app.rs b/crates/gpui2/src/app.rs index 60c1c12bed..1fc9b9a5f1 100644 --- a/crates/gpui2/src/app.rs +++ b/crates/gpui2/src/app.rs @@ -120,7 +120,7 @@ type FrameCallback = Box; type Handler = Box bool + Send + 'static>; type Listener = Box bool + Send + 'static>; type QuitHandler = Box BoxFuture<'static, ()> + Send + 'static>; -type ReleaseListener = Box; +type ReleaseListener = Box; pub struct AppContext { this: Weak>, @@ -408,7 +408,7 @@ impl AppContext { for (entity_id, mut entity) in dropped { self.observers.remove(&entity_id); self.event_listeners.remove(&entity_id); - for mut release_callback in self.release_listeners.remove(&entity_id) { + for release_callback in self.release_listeners.remove(&entity_id) { release_callback(&mut entity, self); } } @@ -697,7 +697,7 @@ impl AppContext { pub fn observe_release( &mut self, handle: &E, - mut on_release: impl FnMut(&mut T, &mut AppContext) + Send + 'static, + on_release: impl FnOnce(&mut T, &mut AppContext) + Send + 'static, ) -> Subscription where E: Entity, diff --git a/crates/gpui2/src/platform.rs b/crates/gpui2/src/platform.rs index d95a20d1f7..295a89a190 100644 --- a/crates/gpui2/src/platform.rs +++ b/crates/gpui2/src/platform.rs @@ -393,18 +393,18 @@ impl Bind for WindowBounds { } }; - todo!() // statement.bind( // ®ion.map(|region| { // ( - // region.min_x(), - // region.min_y(), - // region.width(), - // region.height(), + // region.origin.x, + // region.origin.y, + // region.size.width, + // region.size.height, // ) // }), // next_index, // ) + todo!() } } diff --git a/crates/gpui2/src/window.rs b/crates/gpui2/src/window.rs index f1d4ff76ac..2d4e90f719 100644 --- a/crates/gpui2/src/window.rs +++ b/crates/gpui2/src/window.rs @@ -1675,7 +1675,7 @@ impl<'a, 'w, V: 'static> ViewContext<'a, 'w, V> { pub fn on_release( &mut self, - mut on_release: impl FnMut(&mut V, &mut WindowContext) + Send + 'static, + on_release: impl FnOnce(&mut V, &mut WindowContext) + Send + 'static, ) -> Subscription { let window_handle = self.window.handle; self.app.release_listeners.insert( diff --git a/crates/workspace2/src/item.rs b/crates/workspace2/src/item.rs index ce4b7b0901..20250f6a71 100644 --- a/crates/workspace2/src/item.rs +++ b/crates/workspace2/src/item.rs @@ -255,7 +255,7 @@ pub trait ItemHandle: 'static + Send { fn on_release( &mut self, cx: &mut AppContext, - callback: Box, + callback: Box, ) -> gpui2::Subscription; fn to_searchable_item_handle(&self, cx: &AppContext) -> Option>; fn breadcrumb_location(&self, cx: &AppContext) -> ToolbarItemLocation; @@ -573,7 +573,7 @@ impl ItemHandle for View { fn on_release( &mut self, cx: &mut AppContext, - mut callback: Box, + callback: Box, ) -> gpui2::Subscription { cx.observe_release(self, move |_, cx| callback(cx)) } diff --git a/crates/zed2/src/zed2.rs b/crates/zed2/src/zed2.rs index e9f6ad0c10..729102046f 100644 --- a/crates/zed2/src/zed2.rs +++ b/crates/zed2/src/zed2.rs @@ -4,9 +4,8 @@ mod only_instance; mod open_listener; pub use assets::*; -use client2::{Client, UserStore}; use collections::HashMap; -use gpui2::{AsyncAppContext, Model}; +use gpui2::{AsyncAppContext, Point}; pub use only_instance::*; pub use open_listener::*; @@ -21,6 +20,7 @@ use futures::{ }; use std::{path::Path, sync::Arc, thread, time::Duration}; use util::{paths::PathLikeWithPosition, ResultExt}; +use workspace2::AppState; pub fn connect_to_cli( server_name: &str, @@ -51,11 +51,6 @@ pub fn connect_to_cli( Ok((async_request_rx, response_tx)) } -pub struct AppState { - pub client: Arc, - pub user_store: Model, -} - pub async fn handle_cli_connection( (mut requests, responses): (mpsc::Receiver, IpcSender), app_state: Arc, @@ -96,118 +91,122 @@ pub async fn handle_cli_connection( } Some(path) }) - .collect() + .collect::>() }; let mut errored = false; - match cx + if let Some(open_paths_task) = cx .update(|cx| workspace2::open_paths(&paths, &app_state, None, cx)) - .await + .log_err() { - Ok((workspace, items)) => { - let mut item_release_futures = Vec::new(); + match open_paths_task.await { + Ok((workspace, items)) => { + let mut item_release_futures = Vec::new(); - for (item, path) in items.into_iter().zip(&paths) { - match item { - Some(Ok(item)) => { - if let Some(point) = caret_positions.remove(path) { - todo!() - // if let Some(active_editor) = item.downcast::() { - // active_editor - // .downgrade() - // .update(&mut cx, |editor, cx| { - // let snapshot = - // editor.snapshot(cx).display_snapshot; - // let point = snapshot - // .buffer_snapshot - // .clip_point(point, Bias::Left); - // editor.change_selections( - // Some(Autoscroll::center()), - // cx, - // |s| s.select_ranges([point..point]), - // ); - // }) - // .log_err(); - // } - } + for (item, path) in items.into_iter().zip(&paths) { + match item { + Some(Ok(mut item)) => { + if let Some(point) = caret_positions.remove(path) { + todo!() + // if let Some(active_editor) = item.downcast::() { + // active_editor + // .downgrade() + // .update(&mut cx, |editor, cx| { + // let snapshot = + // editor.snapshot(cx).display_snapshot; + // let point = snapshot + // .buffer_snapshot + // .clip_point(point, Bias::Left); + // editor.change_selections( + // Some(Autoscroll::center()), + // cx, + // |s| s.select_ranges([point..point]), + // ); + // }) + // .log_err(); + // } + } - let released = oneshot::channel(); - cx.update(|cx| { - item.on_release( - cx, - Box::new(move |_| { - let _ = released.0.send(()); - }), - ) - .detach(); - }); - item_release_futures.push(released.1); - } - Some(Err(err)) => { - responses - .send(CliResponse::Stderr { - message: format!("error opening {:?}: {}", path, err), - }) - .log_err(); - errored = true; - } - None => {} - } - } - - if wait { - let executor = cx.executor(); - let wait = async move { - if paths.is_empty() { - let (done_tx, done_rx) = oneshot::channel(); - if let Some(workspace) = workspace.upgrade(&cx) { - let _subscription = cx.update(|cx| { - cx.observe_release(&workspace, move |_, _| { - let _ = done_tx.send(()); - }) + let released = oneshot::channel(); + cx.update(move |cx| { + item.on_release( + cx, + Box::new(move |_| { + let _ = released.0.send(()); + }), + ) + .detach(); }); + item_release_futures.push(released.1); + } + Some(Err(err)) => { + responses + .send(CliResponse::Stderr { + message: format!( + "error opening {:?}: {}", + path, err + ), + }) + .log_err(); + errored = true; + } + None => {} + } + } + + if wait { + let executor = cx.executor().clone(); + let wait = async move { + if paths.is_empty() { + let (done_tx, done_rx) = oneshot::channel(); + let _subscription = + cx.update_window_root(&workspace, move |_, cx| { + cx.on_release(|_, _| { + let _ = done_tx.send(()); + }) + }); drop(workspace); let _ = done_rx.await; - } - } else { - let _ = - futures::future::try_join_all(item_release_futures).await; - }; - } - .fuse(); - futures::pin_mut!(wait); + } else { + let _ = futures::future::try_join_all(item_release_futures) + .await; + }; + } + .fuse(); + futures::pin_mut!(wait); - loop { - // Repeatedly check if CLI is still open to avoid wasting resources - // waiting for files or workspaces to close. - let mut timer = executor.timer(Duration::from_secs(1)).fuse(); - futures::select_biased! { - _ = wait => break, - _ = timer => { - if responses.send(CliResponse::Ping).is_err() { - break; + loop { + // Repeatedly check if CLI is still open to avoid wasting resources + // waiting for files or workspaces to close. + let mut timer = executor.timer(Duration::from_secs(1)).fuse(); + futures::select_biased! { + _ = wait => break, + _ = timer => { + if responses.send(CliResponse::Ping).is_err() { + break; + } } } } } } + Err(error) => { + errored = true; + responses + .send(CliResponse::Stderr { + message: format!("error opening {:?}: {}", paths, error), + }) + .log_err(); + } } - Err(error) => { - errored = true; - responses - .send(CliResponse::Stderr { - message: format!("error opening {:?}: {}", paths, error), - }) - .log_err(); - } - } - responses - .send(CliResponse::Exit { - status: i32::from(errored), - }) - .log_err(); + responses + .send(CliResponse::Exit { + status: i32::from(errored), + }) + .log_err(); + } } } }