mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 00:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

💄

Browse source
This commit is contained in:
Antonio Scandurra 2021-06-21 17:30:08 +02:00
parent 7489e86c47
commit 5c0f4e572f
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
zed/src/worktree.rs
View file

@ -142,7 +142,7 @@ struct FileHandleState {
path: Arc<Path>,
is_deleted: bool,
mtime: Duration,
remote_worktree_id: usize,
worktree_id: usize,
id: u64,
rpc: Option<(ConnectionId, rpc::Client)>,
}
@ -151,7 +151,7 @@ impl Drop for FileHandleState {
fn drop(&mut self) {
if let Some((connection_id, rpc)) = self.rpc.take() {
let id = self.id;
let worktree_id = self.remote_worktree_id as u64;
let worktree_id = self.worktree_id as u64;
smol::spawn(async move {
if let Err(error) = rpc
.send(connection_id, proto::CloseFile { worktree_id, id })
@ -733,8 +733,7 @@ impl PartialEq for FileHandle {
} else {
let self_state = self.state.lock();
let other_state = other.state.lock();
self_state.remote_worktree_id == other_state.remote_worktree_id
&& self_state.id == other_state.id
self_state.worktree_id == other_state.worktree_id && self_state.id == other_state.id
}
}
}
@ -1500,7 +1499,7 @@ impl WorktreeHandle for ModelHandle<Worktree> {
path: entry.path().clone(),
is_deleted: false,
mtime,
remote_worktree_id: worktree_id,
worktree_id,
id,
rpc: None,
}
@ -1509,7 +1508,7 @@ impl WorktreeHandle for ModelHandle<Worktree> {
path: path.clone(),
is_deleted: !tree.path_is_pending(&path),
mtime,
remote_worktree_id: worktree_id,
worktree_id,
id,
rpc: None,
}
@ -1561,7 +1560,7 @@ impl WorktreeHandle for ModelHandle<Worktree> {
path,
is_deleted,
mtime: Duration::from_secs(response.mtime),
remote_worktree_id,
worktree_id: remote_worktree_id,
id: response.id,
rpc: Some((connection_id, rpc)),
}));