zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-10 14:06:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2140 from zed-industries/feedback/929-project-search-crashes

Browse Source 
Feedback/929 project search crashes
This commit is contained in:
Max Brunsfeld 2023-02-07 10:12:00 -08:00 committed by GitHub
commit 0c49030ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/search/src/project_search.rs
View File

@ -259,11 +259,7 @@ impl Item for ProjectSearchView {
.boxed(),
)
.with_children(self.model.read(cx).active_query.as_ref().map(|query| {
let query_text = if query.as_str().len() > MAX_TAB_TITLE_LEN {
query.as_str()[..MAX_TAB_TITLE_LEN].to_string() + "…"
} else {
query.as_str().to_string()
};
let query_text = util::truncate_and_trailoff(query.as_str(), MAX_TAB_TITLE_LEN);
Label::new(query_text, tab_theme.label.clone())
.aligned()

16
crates/util/src/lib.rs
View File

@ -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(),
}
}
@ -276,4 +276,12 @@ mod tests {
assert_eq!(foo, None);
}
#[test]
fn test_trancate_and_trailoff() {
assert_eq!(truncate_and_trailoff("", 5), "");
assert_eq!(truncate_and_trailoff("èèèèèè", 7), "èèèèèè");
assert_eq!(truncate_and_trailoff("èèèèèè", 6), "èèèèèè");
assert_eq!(truncate_and_trailoff("èèèèèè", 5), "èèèèè…");
}
}