mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-06 10:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Allow format_distance to take a DateTimeType

Browse source
This commit is contained in:
Nate Butler 2023-12-19 11:16:59 -05:00
parent 30b01b9bc0
commit ae313ff830
1 changed files with 45 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
crates/ui2/src/utils/format_distance.rs
View file

@ -1,4 +1,23 @@
use chrono::NaiveDateTime; use chrono::{DateTime, Local, NaiveDateTime};
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub enum DateTimeType {
Naive(NaiveDateTime),
Local(DateTime<Local>),
}
impl DateTimeType {
/// Converts the DateTimeType to a NaiveDateTime.
///
/// If the DateTimeType is already a NaiveDateTime, it will be returned as is.
/// If the DateTimeType is a DateTime<Local>, it will be converted to a NaiveDateTime.
pub fn to_naive(&self) -> NaiveDateTime {
match self {
DateTimeType::Naive(naive) => *naive,
DateTimeType::Local(local) => local.naive_local(),
}
}
}
/// Calculates the distance in seconds between two NaiveDateTime objects. /// Calculates the distance in seconds between two NaiveDateTime objects.
/// It returns a signed integer denoting the difference. If `date` is earlier than `base_date`, the returned value will be negative. /// It returns a signed integer denoting the difference. If `date` is earlier than `base_date`, the returned value will be negative.
@ -108,13 +127,13 @@ fn distance_string(distance: i64, include_seconds: bool, add_suffix: bool) -> St
/// ``` /// ```
/// ///
/// Output: `"There was about 3 years between the first and last crewed moon landings."` /// Output: `"There was about 3 years between the first and last crewed moon landings."`
pub fn naive_format_distance( pub fn format_distance(
date: NaiveDateTime, date: DateTimeType,
base_date: NaiveDateTime, base_date: NaiveDateTime,
include_seconds: bool, include_seconds: bool,
add_suffix: bool, add_suffix: bool,
) -> String { ) -> String {
let distance = distance_in_seconds(date, base_date); let distance = distance_in_seconds(date.to_naive(), base_date);
distance_string(distance, include_seconds, add_suffix) distance_string(distance, include_seconds, add_suffix)
} }
@ -142,14 +161,14 @@ pub fn naive_format_distance(
/// ``` /// ```
/// ///
/// Output: `It's been over 54 years since Apollo 11 first landed on the moon.` /// Output: `It's been over 54 years since Apollo 11 first landed on the moon.`
pub fn naive_format_distance_from_now( pub fn format_distance_from_now(
datetime: NaiveDateTime, datetime: DateTimeType,
include_seconds: bool, include_seconds: bool,
add_suffix: bool, add_suffix: bool,
) -> String { ) -> String {
let now = chrono::offset::Local::now().naive_local(); let now = chrono::offset::Local::now().naive_local();
naive_format_distance(datetime, now, include_seconds, add_suffix) format_distance(datetime, now, include_seconds, add_suffix)
} }
#[cfg(test)] #[cfg(test)]
@ -159,38 +178,44 @@ mod tests {
#[test] #[test]
fn test_naive_format_distance() { fn test_naive_format_distance() {
let date = let date = DateTimeType::Naive(
NaiveDateTime::from_timestamp_opt(9600, 0).expect("Invalid NaiveDateTime for date"); NaiveDateTime::from_timestamp_opt(9600, 0).expect("Invalid NaiveDateTime for date"),
let base_date = );
NaiveDateTime::from_timestamp_opt(0, 0).expect("Invalid NaiveDateTime for base_date"); let base_date = DateTimeType::Naive(
NaiveDateTime::from_timestamp_opt(0, 0).expect("Invalid NaiveDateTime for base_date"),
);
assert_eq!( assert_eq!(
"about 2 hours", "about 2 hours",
naive_format_distance(date, base_date, false, false) format_distance(date, base_date.to_naive(), false, false)
); );
} }
#[test] #[test]
fn test_naive_format_distance_with_suffix() { fn test_naive_format_distance_with_suffix() {
let date = let date = DateTimeType::Naive(
NaiveDateTime::from_timestamp_opt(9600, 0).expect("Invalid NaiveDateTime for date"); NaiveDateTime::from_timestamp_opt(9600, 0).expect("Invalid NaiveDateTime for date"),
let base_date = );
NaiveDateTime::from_timestamp_opt(0, 0).expect("Invalid NaiveDateTime for base_date"); let base_date = DateTimeType::Naive(
NaiveDateTime::from_timestamp_opt(0, 0).expect("Invalid NaiveDateTime for base_date"),
);
assert_eq!( assert_eq!(
"about 2 hours from now", "about 2 hours from now",
naive_format_distance(date, base_date, false, true) format_distance(date, base_date.to_naive(), false, true)
); );
} }
#[test] #[test]
fn test_naive_format_distance_from_now() { fn test_naive_format_distance_from_now() {
let date = NaiveDateTime::parse_from_str("1969-07-20T00:00:00Z", "%Y-%m-%dT%H:%M:%SZ") let date = DateTimeType::Naive(
.expect("Invalid NaiveDateTime for date"); NaiveDateTime::parse_from_str("1969-07-20T00:00:00Z", "%Y-%m-%dT%H:%M:%SZ")
.expect("Invalid NaiveDateTime for date"),
);
assert_eq!( assert_eq!(
"over 54 years ago", "over 54 years ago",
naive_format_distance_from_now(date, false, true) format_distance_from_now(date, false, true)
); );
} }