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
9 changes: 7 additions & 2 deletions src/ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ fn matched_name(
};
let mut spans = Vec::new();
let mut cursor = 0;
for range in ranges {
for range in &ranges {
let start = range.start.min(end);
let stop = range.end.min(end);
if cursor < start {
Expand All @@ -411,7 +411,12 @@ fn matched_name(
spans.push(Span::raw(name[cursor..end].to_owned()));
}
if end < name.len() {
spans.push(Span::raw(label[end..].to_owned()));
let ellipsis_style = if ranges.iter().any(|range| range.end > end) {
style
} else {
Style::default()
};
spans.push(Span::styled(label[end..].to_owned(), ellipsis_style));
}
spans
}
Expand Down
37 changes: 37 additions & 0 deletions src/ui/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,43 @@ fn selection_and_matching_have_distinct_styles_and_aligned_marks() {
}
}

#[rstest]
#[case(10, "青carbon", false, "青Carbon..", "青Carbon")]
#[case(10, "carbontransparent", false, "青Carbon..", "Carbon..")]
#[case(10, "inverse", false, "青Carbon..", "..")]
#[case(10, "type:dark", false, "青Carbon..", "")]
#[case(10, "carbontransparent", true, "青Carbon..", "")]
#[case(1, "inverse", false, ".", ".")]
#[case(0, "inverse", false, "", "")]
#[case(26, "inverse", false, "青CarbonTransparentInverse", "Inverse")]
fn theme_name_highlighting_covers_matches_in_the_omitted_suffix(
#[case] width: usize,
#[case] query: &str,
#[case] selected: bool,
#[case] label: &str,
#[case] highlighted: &str,
) {
let filter = crate::search::Filter::parse(query).unwrap();
let theme = UiTheme::default();
let line = Line::from(matched_name(
"青CarbonTransparentInverse",
width,
Some(&filter),
selected,
theme,
));

assert_eq!(line.to_string(), label);
assert_eq!(
line.spans
.iter()
.filter(|span| span.style == theme.search_match_style())
.map(|span| span.content.as_ref())
.collect::<String>(),
highlighted
);
}

#[rstest]
#[case(None, Modifier::REVERSED)]
#[case(Some(Modifier::empty()), Modifier::empty())]
Expand Down
Loading