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

Fixed a bug where buffer saved clocks would desynchronize in rare execution paths

Browse source 
co-authored-by: Max <max@zed.dev>
This commit is contained in:
Mikayla Maki 2023-06-07 16:10:23 -07:00
parent cd63ec2c7f
commit 2c5e83bf72
No known key found for this signature in database
4 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/project/src/worktree.rs
View file

@ -923,7 +923,7 @@ impl LocalWorktree {
path: Arc<Path>,
has_changed_file: bool,
cx: &mut ModelContext<Worktree>,
) -> Task<Result<(clock::Global, RopeFingerprint, SystemTime)>> {
) -> Task<Result<()>> {
let handle = cx.handle();
let buffer = buffer_handle.read(cx);
@ -979,7 +979,7 @@ impl LocalWorktree {
buffer.did_save(version.clone(), fingerprint, entry.mtime, cx);
});
Ok((version, fingerprint, entry.mtime))
Ok(())
})
}
@ -1290,7 +1290,7 @@ impl RemoteWorktree {
&self,
buffer_handle: ModelHandle<Buffer>,
cx: &mut ModelContext<Worktree>,
) -> Task<Result<(clock::Global, RopeFingerprint, SystemTime)>> {
) -> Task<Result<()>> {
let buffer = buffer_handle.read(cx);
let buffer_id = buffer.remote_id();
let version = buffer.version();
@ -1315,7 +1315,7 @@ impl RemoteWorktree {
buffer.did_save(version.clone(), fingerprint, mtime, cx);
});
Ok((version, fingerprint, mtime))
Ok(())
})
}