language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: avoid adding enum parens in use

Browse source
This commit is contained in:
yue4u 2022-06-06 01:34:01 +09:00
parent 995a17fbd9
commit 11693dad88
4 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ use hir::{db::HirDatabase, Documentation, HasAttrs, StructKind};
use ide_db::SymbolKind;
use crate::{
context::{CompletionContext, PathCompletionCtx},
context::{CompletionContext, PathCompletionCtx, PathKind},
item::{Builder, CompletionItem},
render::{
compute_ref_match, compute_type_match,
@ -50,9 +50,15 @@ fn render(
path: Option<hir::ModPath>,
) -> Option<Builder> {
let db = completion.db;
let kind = thing.kind(db);
let has_call_parens =
matches!(completion.path_context(), Some(PathCompletionCtx { has_call_parens: true, .. }));
let mut kind = thing.kind(db);
let should_add_parens = match completion.path_context() {
Some(PathCompletionCtx { has_call_parens: true, .. }) => false,
Some(PathCompletionCtx { kind: PathKind::Use | PathKind::Type { .. }, .. }) => {
cov_mark::hit!(no_parens_in_use_item);
false
}
_ => true,
};
let fields = thing.fields(completion)?;
let (qualified_name, short_qualified_name, qualified) = match path {
@ -69,10 +75,10 @@ fn render(
let snippet_cap = ctx.snippet_cap();
let mut rendered = match kind {
StructKind::Tuple if !has_call_parens => {
StructKind::Tuple if should_add_parens => {
render_tuple_lit(db, snippet_cap, &fields, &qualified_name)
}
StructKind::Record if !has_call_parens => {
StructKind::Record if should_add_parens => {
render_record_lit(db, snippet_cap, &fields, &qualified_name)
}
_ => RenderedLiteral { literal: qualified_name.clone(), detail: qualified_name.clone() },
@ -82,6 +88,11 @@ fn render(
rendered.literal.push_str("$0");
}
// only show name in label if not adding parens
if !should_add_parens {
kind = StructKind::Unit;
}
let mut item = CompletionItem::new(
CompletionItemKind::SymbolKind(thing.symbol_kind()),
ctx.source_range(),