vrr/zed
2
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-02 07:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

sidebar: Consistent thread display time (#53887)

Browse source 
Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
This commit is contained in:
Cameron Mcloughlin 2026-04-14 14:26:35 +01:00 • committed by GitHub
parent c49973d705
commit a49739e2df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

55
crates/sidebar/src/sidebar.rs
View file

@ -1275,28 +1275,8 @@ impl Sidebar {
}
threads.sort_by(|a, b| {
let a_time = a
.metadata
.session_id
.as_ref()
.and_then(|_sid| {
self.thread_last_message_sent_or_queued
.get(&a.metadata.thread_id)
})
.copied()
.or(a.metadata.created_at)
.or(Some(a.metadata.updated_at));
let b_time = b
.metadata
.session_id
.as_ref()
.and_then(|_sid| {
self.thread_last_message_sent_or_queued
.get(&b.metadata.thread_id)
})
.copied()
.or(b.metadata.created_at)
.or(Some(b.metadata.updated_at));
let a_time = self.display_time(&a.metadata);
let b_time = self.display_time(&b.metadata);
b_time.cmp(&a_time)
});
} else {
@ -3483,6 +3463,13 @@ impl Sidebar {
.insert(*thread_id, Utc::now());
}
fn display_time(&self, metadata: &ThreadMetadata) -> DateTime<Utc> {
self.thread_last_message_sent_or_queued
.get(&metadata.thread_id)
.copied()
.unwrap_or(metadata.updated_at)
}
fn mru_threads_for_switcher(&self, cx: &App) -> Vec<ThreadSwitcherEntry> {
let mut current_header_label: Option<SharedString> = None;
let mut current_header_key: Option<ProjectGroupKey> = None;
@ -3513,14 +3500,8 @@ impl Sidebar {
}
}?;
let notified = self.contents.is_thread_notified(&thread.metadata.thread_id);
let timestamp: SharedString = format_history_entry_timestamp(
self.thread_last_message_sent_or_queued
.get(&thread.metadata.thread_id)
.copied()
.or(thread.metadata.created_at)
.unwrap_or(thread.metadata.updated_at),
)
.into();
let timestamp: SharedString =
format_history_entry_timestamp(self.display_time(&thread.metadata)).into();
Some(ThreadSwitcherEntry {
session_id,
title: thread.metadata.display_title(),
@ -3570,11 +3551,7 @@ impl Sidebar {
(Some(a_time), Some(b_time)) => b_time.cmp(a_time),
(Some(_), None) => std::cmp::Ordering::Less,
(None, Some(_)) => std::cmp::Ordering::Greater,
(None, None) => {
let a_time = a.metadata.created_at.or(Some(a.metadata.updated_at));
let b_time = b.metadata.created_at.or(Some(b.metadata.updated_at));
b_time.cmp(&a_time)
}
(None, None) => b.metadata.updated_at.cmp(&a.metadata.updated_at),
}
}
}
@ -3794,13 +3771,7 @@ impl Sidebar {
.title_bar_background
.blend(color.panel_background.opacity(0.25));
let timestamp = format_history_entry_timestamp(
self.thread_last_message_sent_or_queued
.get(&thread.metadata.thread_id)
.copied()
.or(thread.metadata.created_at)
.unwrap_or(thread.metadata.updated_at),
);
let timestamp = format_history_entry_timestamp(self.display_time(&thread.metadata));
let is_remote = thread.workspace.is_remote(cx);