mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-24 06:19:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use != for mtime comparison instead of >

Browse source 
This improves some behavior, but also reveals misbehavior such as #21034.

See ["mtime comparison considered harmful"](https://apenwarr.ca/log/20181113) for details of why comparators other than equality/inequality should not be used with mtime.
This commit is contained in:
mgsloan@gmail.com 2024-11-21 17:39:24 -07:00
parent 14ea4621ab
commit bab6a6416e
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3412,7 +3412,8 @@ async fn test_local_settings(
});
}
#[gpui::test(iterations = 10)]
// TODO(#21034): This test is flaky for some execution orders. Set iterations back to 10 once fixed.
#[gpui::test(iterations = 4)]
async fn test_buffer_conflict_after_save(
executor: BackgroundExecutor,
cx_a: &mut TestAppContext,

5
crates/extension_host/src/extension_host.rs
View file

@ -345,10 +345,7 @@ impl ExtensionStore {
if let (Ok(Some(index_metadata)), Ok(Some(extensions_metadata))) =
(index_metadata, extensions_metadata)
{
if index_metadata
.mtime
.bad_is_greater_than(extensions_metadata.mtime)
{
if index_metadata.mtime != extensions_metadata.mtime {
extension_index_needs_rebuild = false;
}
}

4
crates/language/src/buffer.rs
View file

@ -1775,9 +1775,7 @@ impl Buffer {
match file.disk_state() {
DiskState::New => false,
DiskState::Present { mtime } => match self.saved_mtime {
Some(saved_mtime) => {
mtime.bad_is_greater_than(saved_mtime) && self.has_unsaved_edits()
}
Some(saved_mtime) => mtime != saved_mtime && self.has_unsaved_edits(),
None => true,
},
DiskState::Deleted => true,