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

Unify save and save_as for local worktrees

Browse source 
This fixes state propagation bugs due to missing RPC calls in save_as.
This commit is contained in:
Max Brunsfeld 2023-02-17 17:08:28 -08:00
parent 3a7cfc3901
commit cdf64b6cad
3 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/collab/src/tests/integration_tests.rs
View file

@ -2326,19 +2326,27 @@ async fn test_propagate_saves_and_fs_changes(
assert!(buffer.file().is_none());
});
new_buffer_a.update(cx_a, |buffer, cx| {
buffer.edit([(0..0, "ok")], None, cx);
});
project_a
.update(cx_a, |project, cx| {
project.save_buffer_as(new_buffer_a, "/a/file3.rs".into(), cx)
project.save_buffer_as(new_buffer_a.clone(), "/a/file3.rs".into(), cx)
})
.await
.unwrap();
deterministic.run_until_parked();
new_buffer_b.read_with(cx_b, |buffer, _| {
new_buffer_b.read_with(cx_b, |buffer_b, _| {
assert_eq!(
buffer.file().unwrap().path().as_ref(),
buffer_b.file().unwrap().path().as_ref(),
Path::new("file3.rs")
);
new_buffer_a.read_with(cx_a, |buffer_a, _| {
assert_eq!(buffer_b.saved_mtime(), buffer_a.saved_mtime());
assert_eq!(buffer_b.saved_version(), buffer_a.saved_version());
});
});
}
@ -2909,7 +2917,9 @@ async fn test_buffer_conflict_after_save(
assert!(!buf.has_conflict());
});
cx_b.update(|cx| Project::save_buffer(buffer_b.clone(), cx)).await.unwrap();
cx_b.update(|cx| Project::save_buffer(buffer_b.clone(), cx))
.await
.unwrap();
cx_a.foreground().forbid_parking();
buffer_b.read_with(cx_b, |buffer_b, _| assert!(!buffer_b.is_dirty()));
buffer_b.read_with(cx_b, |buf, _| {