language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-18 17:40:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

pass snippet_cap to format_literal_label, return early if None

Browse source
This commit is contained in:
Brent Westbrook 2022-12-20 11:27:19 -05:00
parent 1116cc93ec
commit 694ae77bf6
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ide-completion/src/render/literal.rs
View file

@ -96,7 +96,7 @@ fn render(
if !should_add_parens { if !should_add_parens {
kind = StructKind::Unit; kind = StructKind::Unit;
} }
let label = format_literal_label(&qualified_name, kind); let label = format_literal_label(&qualified_name, kind, snippet_cap);
let lookup = if qualified { let lookup = if qualified {
format_literal_lookup(&short_qualified_name.to_string(), kind) format_literal_lookup(&short_qualified_name.to_string(), kind)
} else { } else {

4
crates/ide-completion/src/render/pattern.rs
View file

@ -33,7 +33,7 @@ pub(crate) fn render_struct_pat(
let name = local_name.unwrap_or_else(|| strukt.name(ctx.db())); let name = local_name.unwrap_or_else(|| strukt.name(ctx.db()));
let (name, escaped_name) = (name.unescaped().to_smol_str(), name.to_smol_str()); let (name, escaped_name) = (name.unescaped().to_smol_str(), name.to_smol_str());
let kind = strukt.kind(ctx.db()); let kind = strukt.kind(ctx.db());
let label = format_literal_label(name.as_str(), kind); let label = format_literal_label(name.as_str(), kind, ctx.snippet_cap());
let lookup = format_literal_lookup(name.as_str(), kind); let lookup = format_literal_lookup(name.as_str(), kind);
let pat = render_pat(&ctx, pattern_ctx, &escaped_name, kind, &visible_fields, fields_omitted)?; let pat = render_pat(&ctx, pattern_ctx, &escaped_name, kind, &visible_fields, fields_omitted)?;
@ -67,7 +67,7 @@ pub(crate) fn render_variant_pat(
} }
_ => { _ => {
let kind = variant.kind(ctx.db()); let kind = variant.kind(ctx.db());
let label = format_literal_label(name.as_str(), kind); let label = format_literal_label(name.as_str(), kind, ctx.snippet_cap());
let lookup = format_literal_lookup(name.as_str(), kind); let lookup = format_literal_lookup(name.as_str(), kind);
let pat = render_pat( let pat = render_pat(
&ctx, &ctx,

2
crates/ide-completion/src/render/union_literal.rs
View file

@ -24,7 +24,7 @@ pub(crate) fn render_union_literal(
Some(p) => (p.unescaped().to_string(), p.to_string()), Some(p) => (p.unescaped().to_string(), p.to_string()),
None => (name.unescaped().to_string(), name.to_string()), None => (name.unescaped().to_string(), name.to_string()),
}; };
let label = format_literal_label(&name.to_smol_str(), StructKind::Record); let label = format_literal_label(&name.to_smol_str(), StructKind::Record, ctx.snippet_cap());
let lookup = format_literal_lookup(&name.to_smol_str(), StructKind::Record); let lookup = format_literal_lookup(&name.to_smol_str(), StructKind::Record);
let mut item = CompletionItem::new( let mut item = CompletionItem::new(
CompletionItemKind::SymbolKind(SymbolKind::Union), CompletionItemKind::SymbolKind(SymbolKind::Union),

9
crates/ide-completion/src/render/variant.rs
View file

@ -90,7 +90,14 @@ pub(crate) fn visible_fields(
} }
/// Format a struct, etc. literal option for display in the completions menu. /// Format a struct, etc. literal option for display in the completions menu.
pub(crate) fn format_literal_label(name: &str, kind: StructKind) -> SmolStr { pub(crate) fn format_literal_label(
name: &str,
kind: StructKind,
snippet_cap: Option<SnippetCap>,
) -> SmolStr {
if snippet_cap.is_none() {
return name.into();
}
match kind { match kind {
StructKind::Tuple => SmolStr::from_iter([name, "(…)"]), StructKind::Tuple => SmolStr::from_iter([name, "(…)"]),
StructKind::Record => SmolStr::from_iter([name, " {…}"]), StructKind::Record => SmolStr::from_iter([name, " {…}"]),