Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/copilot/src/copilot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1780,6 +1780,7 @@ mod tests {
fn disk_state(&self) -> language::DiskState {
language::DiskState::Present {
mtime: ::fs::MTime::from_seconds_and_nanos(100, 42),
size: 0,
}
}

Expand Down
16 changes: 13 additions & 3 deletions crates/language/src/buffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ pub enum DiskState {
/// File created in Zed that has not been saved.
New,
/// File present on the filesystem.
Present { mtime: MTime },
Present { mtime: MTime, size: u64 },
/// Deleted file that was previously present.
Deleted,
/// An old version of a file that was previously present
Expand All @@ -448,7 +448,17 @@ impl DiskState {
pub fn mtime(self) -> Option<MTime> {
match self {
DiskState::New => None,
DiskState::Present { mtime } => Some(mtime),
DiskState::Present { mtime, .. } => Some(mtime),
DiskState::Deleted => None,
DiskState::Historic { .. } => None,
}
}

/// Returns the file's size on disk in bytes.
pub fn size(self) -> Option<u64> {
match self {
DiskState::New => None,
DiskState::Present { size, .. } => Some(size),
DiskState::Deleted => None,
DiskState::Historic { .. } => None,
}
Expand Down Expand Up @@ -2373,7 +2383,7 @@ impl Buffer {
};
match file.disk_state() {
DiskState::New => false,
DiskState::Present { mtime } => match self.saved_mtime {
DiskState::Present { mtime, .. } => match self.saved_mtime {
Some(saved_mtime) => {
mtime.bad_is_greater_than(saved_mtime) && self.has_unsaved_edits()
}
Expand Down
5 changes: 4 additions & 1 deletion crates/project/src/buffer_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,10 @@ impl LocalBufferStore {
let new_file = if let Some(entry) = snapshot_entry {
File {
disk_state: match entry.mtime {
Some(mtime) => DiskState::Present { mtime },
Some(mtime) => DiskState::Present {
mtime,
size: entry.size,
},
None => old_file.disk_state,
},
is_local: true,
Expand Down
5 changes: 4 additions & 1 deletion crates/project/src/image_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,10 @@ impl LocalImageStore {
let new_file = if let Some(entry) = snapshot_entry {
worktree::File {
disk_state: match entry.mtime {
Some(mtime) => DiskState::Present { mtime },
Some(mtime) => DiskState::Present {
mtime,
size: entry.size,
},
None => old_file.disk_state,
},
is_local: true,
Expand Down
10 changes: 8 additions & 2 deletions crates/worktree/src/worktree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,7 @@ impl LocalWorktree {
path,
disk_state: DiskState::Present {
mtime: metadata.mtime,
size: metadata.len,
},
is_local: true,
is_private,
Expand Down Expand Up @@ -1378,6 +1379,7 @@ impl LocalWorktree {
path,
disk_state: DiskState::Present {
mtime: metadata.mtime,
size: metadata.len,
},
is_local: true,
is_private,
Expand Down Expand Up @@ -1575,6 +1577,7 @@ impl LocalWorktree {
path,
disk_state: DiskState::Present {
mtime: metadata.mtime,
size: metadata.len,
},
entry_id: None,
is_local: true,
Expand Down Expand Up @@ -3280,7 +3283,10 @@ impl File {
worktree,
path: entry.path.clone(),
disk_state: if let Some(mtime) = entry.mtime {
DiskState::Present { mtime }
DiskState::Present {
mtime,
size: entry.size,
}
} else {
DiskState::New
},
Expand Down Expand Up @@ -3309,7 +3315,7 @@ impl File {
} else if proto.is_deleted {
DiskState::Deleted
} else if let Some(mtime) = proto.mtime.map(&Into::into) {
DiskState::Present { mtime }
DiskState::Present { mtime, size: 0 }
} else {
DiskState::New
};
Expand Down
Loading