mirror of
https://github.com/zed-industries/zed.git
synced 2024-10-26 00:19:46 +00:00
Stub in more logic for open_file and close_file
This commit is contained in:
parent
0deaa3a61d
commit
96c118b4df
2 changed files with 45 additions and 11 deletions
|
@ -27,6 +27,7 @@ use std::{
|
|||
future::Future,
|
||||
path::{Path, PathBuf},
|
||||
sync::Arc,
|
||||
time::UNIX_EPOCH,
|
||||
};
|
||||
use zed_rpc::{proto, TypedEnvelope};
|
||||
|
||||
|
@ -45,6 +46,7 @@ pub fn init(cx: &mut MutableAppContext, rpc: rpc::Client) {
|
|||
pane::init(cx);
|
||||
|
||||
rpc.on_message(remote::open_file, cx);
|
||||
rpc.on_message(remote::close_file, cx);
|
||||
rpc.on_message(remote::open_buffer, cx);
|
||||
}
|
||||
|
||||
|
@ -116,30 +118,58 @@ mod remote {
|
|||
cx: &mut AsyncAppContext,
|
||||
) -> anyhow::Result<()> {
|
||||
let message = &request.payload;
|
||||
let mut state = rpc.state.lock().await;
|
||||
let peer_id = request
|
||||
.original_sender_id
|
||||
.ok_or_else(|| anyhow!("missing original sender id"))?;
|
||||
|
||||
let mut state = rpc.state.lock().await;
|
||||
let worktree = state
|
||||
.shared_worktrees
|
||||
.get(&(message.worktree_id as usize))
|
||||
.ok_or_else(|| anyhow!("worktree {} not found", message.worktree_id))?
|
||||
.clone();
|
||||
|
||||
let peer_id = request
|
||||
.original_sender_id
|
||||
.ok_or_else(|| anyhow!("missing original sender id"))?;
|
||||
|
||||
let file = cx.update(|cx| worktree.file(&message.path, cx)).await?;
|
||||
let id = file.id() as u64;
|
||||
let mtime = file.mtime().duration_since(UNIX_EPOCH).unwrap().as_secs();
|
||||
|
||||
let file_entry = state.shared_files.entry(file);
|
||||
if matches!(file_entry, Entry::Vacant(_)) {
|
||||
worktree.update(cx, |worktree, cx| {});
|
||||
}
|
||||
*file_entry
|
||||
*state
|
||||
.shared_files
|
||||
.entry(file)
|
||||
.or_insert(Default::default())
|
||||
.entry(peer_id)
|
||||
.or_insert(0) += 1;
|
||||
|
||||
todo!()
|
||||
rpc.respond(request.receipt(), proto::OpenFileResponse { id, mtime })
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn close_file(
|
||||
request: TypedEnvelope<proto::CloseFile>,
|
||||
rpc: &rpc::Client,
|
||||
_: &mut AsyncAppContext,
|
||||
) -> anyhow::Result<()> {
|
||||
let message = &request.payload;
|
||||
let peer_id = request
|
||||
.original_sender_id
|
||||
.ok_or_else(|| anyhow!("missing original sender id"))?;
|
||||
|
||||
let mut state = rpc.state.lock().await;
|
||||
if let Some((_, ref_counts)) = state
|
||||
.shared_files
|
||||
.iter_mut()
|
||||
.find(|(file, _)| file.id() as u64 == message.id)
|
||||
{
|
||||
if let Some(count) = ref_counts.get_mut(&peer_id) {
|
||||
*count -= 1;
|
||||
if *count == 0 {
|
||||
ref_counts.remove(&peer_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn open_buffer(
|
||||
|
|
|
@ -622,6 +622,10 @@ impl fmt::Debug for Snapshot {
|
|||
}
|
||||
|
||||
impl FileHandle {
|
||||
pub fn id(&self) -> usize {
|
||||
self.state.lock().id
|
||||
}
|
||||
|
||||
/// Returns this file's path relative to the root of its worktree.
|
||||
pub fn path(&self) -> Arc<Path> {
|
||||
self.state.lock().path.clone()
|
||||
|
|
Loading…
Reference in a new issue