Skip to content

Commit f0adf8c

Browse files
committed
Update tests
1 parent 615abb3 commit f0adf8c

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

crates/ide-completion/src/render.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,11 @@ mod tests {
557557

558558
let tag = it.kind.tag();
559559
let relevance = display_relevance(it.relevance);
560-
items.push(format!("{tag} {} {relevance}\n", it.label));
560+
items.push(format!(
561+
"{tag} {}{} {relevance}\n",
562+
it.label,
563+
it.label_detail.clone().unwrap_or_default(),
564+
));
561565

562566
if let Some((label, _indel, relevance)) = it.ref_match() {
563567
let relevance = display_relevance(relevance);

crates/ide-completion/src/tests.rs

+16-3
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,29 @@ fn render_completion_list(completions: Vec<CompletionItem>) -> String {
150150
fn monospace_width(s: &str) -> usize {
151151
s.chars().count()
152152
}
153-
let label_width =
154-
completions.iter().map(|it| monospace_width(&it.label)).max().unwrap_or_default().min(22);
153+
let label_width = completions
154+
.iter()
155+
.map(|it| {
156+
monospace_width(&it.label)
157+
+ monospace_width(it.label_detail.as_deref().unwrap_or_default())
158+
})
159+
.max()
160+
.unwrap_or_default()
161+
.min(22);
155162
completions
156163
.into_iter()
157164
.map(|it| {
158165
let tag = it.kind.tag();
159166
let var_name = format!("{tag} {}", it.label);
160167
let mut buf = var_name;
168+
if let Some(ref label_detail) = it.label_detail {
169+
format_to!(buf, "{label_detail}");
170+
}
161171
if let Some(detail) = it.detail {
162-
let width = label_width.saturating_sub(monospace_width(&it.label));
172+
let width = label_width.saturating_sub(
173+
monospace_width(&it.label)
174+
+ monospace_width(&it.label_detail.unwrap_or_default()),
175+
);
163176
format_to!(buf, "{:width$} {}", "", detail, width = width);
164177
}
165178
if it.deprecated {

0 commit comments

Comments
 (0)