Skip to content

Commit 694ae77

Browse files
committed
pass snippet_cap to format_literal_label, return early if None
1 parent 1116cc9 commit 694ae77

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

crates/ide-completion/src/render/literal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ fn render(
9696
if !should_add_parens {
9797
kind = StructKind::Unit;
9898
}
99-
let label = format_literal_label(&qualified_name, kind);
99+
let label = format_literal_label(&qualified_name, kind, snippet_cap);
100100
let lookup = if qualified {
101101
format_literal_lookup(&short_qualified_name.to_string(), kind)
102102
} else {

crates/ide-completion/src/render/pattern.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub(crate) fn render_struct_pat(
3333
let name = local_name.unwrap_or_else(|| strukt.name(ctx.db()));
3434
let (name, escaped_name) = (name.unescaped().to_smol_str(), name.to_smol_str());
3535
let kind = strukt.kind(ctx.db());
36-
let label = format_literal_label(name.as_str(), kind);
36+
let label = format_literal_label(name.as_str(), kind, ctx.snippet_cap());
3737
let lookup = format_literal_lookup(name.as_str(), kind);
3838
let pat = render_pat(&ctx, pattern_ctx, &escaped_name, kind, &visible_fields, fields_omitted)?;
3939

@@ -67,7 +67,7 @@ pub(crate) fn render_variant_pat(
6767
}
6868
_ => {
6969
let kind = variant.kind(ctx.db());
70-
let label = format_literal_label(name.as_str(), kind);
70+
let label = format_literal_label(name.as_str(), kind, ctx.snippet_cap());
7171
let lookup = format_literal_lookup(name.as_str(), kind);
7272
let pat = render_pat(
7373
&ctx,

crates/ide-completion/src/render/union_literal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub(crate) fn render_union_literal(
2424
Some(p) => (p.unescaped().to_string(), p.to_string()),
2525
None => (name.unescaped().to_string(), name.to_string()),
2626
};
27-
let label = format_literal_label(&name.to_smol_str(), StructKind::Record);
27+
let label = format_literal_label(&name.to_smol_str(), StructKind::Record, ctx.snippet_cap());
2828
let lookup = format_literal_lookup(&name.to_smol_str(), StructKind::Record);
2929
let mut item = CompletionItem::new(
3030
CompletionItemKind::SymbolKind(SymbolKind::Union),

crates/ide-completion/src/render/variant.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,14 @@ pub(crate) fn visible_fields(
9090
}
9191

9292
/// Format a struct, etc. literal option for display in the completions menu.
93-
pub(crate) fn format_literal_label(name: &str, kind: StructKind) -> SmolStr {
93+
pub(crate) fn format_literal_label(
94+
name: &str,
95+
kind: StructKind,
96+
snippet_cap: Option<SnippetCap>,
97+
) -> SmolStr {
98+
if snippet_cap.is_none() {
99+
return name.into();
100+
}
94101
match kind {
95102
StructKind::Tuple => SmolStr::from_iter([name, "(…)"]),
96103
StructKind::Record => SmolStr::from_iter([name, " {…}"]),

0 commit comments

Comments
 (0)