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

internal: NameRefKind classification is not optional

Browse source
This commit is contained in:
Lukas Wirth 2022-06-18 08:58:47 +02:00
parent 12dd81092e
commit 309ecdd71c
13 changed files with 145 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,8 @@ use syntax::SmolStr;
use crate::{
context::{
IdentContext, NameRefContext, NameRefKind, ParamKind, PathCompletionCtx, PatternContext,
IdentContext, NameContext, NameKind, NameRefContext, NameRefKind, ParamKind,
PathCompletionCtx, PathKind, PatternContext,
},
render::{variant::visible_fields, RenderContext},
CompletionItem, CompletionItemKind,
@ -82,7 +83,7 @@ fn render_pat(
let has_call_parens = matches!(
ctx.completion.ident_ctx,
IdentContext::NameRef(NameRefContext {
kind: Some(NameRefKind::Path(PathCompletionCtx { has_call_parens: true, .. })),
kind: NameRefKind::Path(PathCompletionCtx { has_call_parens: true, .. }),
..
})
);
@ -97,14 +98,27 @@ fn render_pat(
_ => name.to_owned(),
};
if matches!(
ctx.completion.pattern_ctx,
Some(PatternContext {
param_ctx: Some((.., ParamKind::Function(_))),
has_type_ascription: false,
..
}) if !has_call_parens
) {
let needs_ascription = !has_call_parens
&& matches!(
&ctx.completion.ident_ctx,
IdentContext::NameRef(NameRefContext {
kind: NameRefKind::Path(PathCompletionCtx {
kind: PathKind::Pat {
pat_ctx
},
..
}),
..
}) | IdentContext::Name(NameContext {
kind: NameKind::IdentPat(pat_ctx), ..}
)
if matches!(pat_ctx, PatternContext {
param_ctx: Some((.., ParamKind::Function(_))),
has_type_ascription: false,
..
})
);
if needs_ascription {
pat.push(':');
pat.push(' ');
pat.push_str(name);