mirror of
https://github.com/zed-industries/zed.git
synced 2024-10-26 08:31:04 +00:00
Make truncate_and_trailoff a bit more clear
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
parent
9bff82f161
commit
e15ffc8560
1 changed files with 8 additions and 11 deletions
|
@ -46,10 +46,10 @@ pub fn truncate(s: &str, max_chars: usize) -> &str {
|
|||
pub fn truncate_and_trailoff(s: &str, max_chars: usize) -> String {
|
||||
debug_assert!(max_chars >= 5);
|
||||
|
||||
if s.len() > max_chars {
|
||||
format!("{}…", truncate(s, max_chars.saturating_sub(3)))
|
||||
} else {
|
||||
s.to_string()
|
||||
let truncation_ix = s.char_indices().map(|(i, _)| i).nth(max_chars);
|
||||
match truncation_ix {
|
||||
Some(length) => s[..length].to_string() + "…",
|
||||
None => s.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -279,12 +279,9 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_trancate_and_trailoff() {
|
||||
const MAX_CHARS: usize = 24;
|
||||
assert_eq!(
|
||||
truncate_and_trailoff("ajouter un compte d'èèèès", MAX_CHARS),
|
||||
"ajouter un compte d'è…"
|
||||
);
|
||||
assert_eq!(truncate_and_trailoff("ajouter", MAX_CHARS), "ajouter");
|
||||
assert_eq!(truncate_and_trailoff("", MAX_CHARS), "");
|
||||
assert_eq!(truncate_and_trailoff("", 5), "");
|
||||
assert_eq!(truncate_and_trailoff("èèèèèè", 7), "èèèèèè");
|
||||
assert_eq!(truncate_and_trailoff("èèèèèè", 6), "èèèèèè");
|
||||
assert_eq!(truncate_and_trailoff("èèèèèè", 5), "èèèèè…");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue