language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Complete parameters more aggressively

Browse source
This commit is contained in:
Aleksey Kladov 2020-07-10 16:07:12 +02:00
parent 74d376763c
commit d02aabe633
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/ra_ide/src/completion/complete_fn_param.rs
View file

@ -1,4 +1,4 @@
//! FIXME: write short doc here //! See `complete_fn_param`.
use ra_syntax::{ use ra_syntax::{
ast::{self, ModuleItemOwner}, ast::{self, ModuleItemOwner},
@ -18,32 +18,36 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
} }
let mut params = FxHashMap::default(); let mut params = FxHashMap::default();
let mut me = None;
for node in ctx.token.parent().ancestors() { for node in ctx.token.parent().ancestors() {
let items = match_ast! { let items = match_ast! {
match node { match node {
ast::SourceFile(it) => it.items(), ast::SourceFile(it) => it.items(),
ast::ItemList(it) => it.items(), ast::ItemList(it) => it.items(),
ast::FnDef(it) => {
me = Some(it);
continue;
},
_ => continue, _ => continue,
} }
}; };
for item in items { for item in items {
if let ast::ModuleItem::FnDef(func) = item { if let ast::ModuleItem::FnDef(func) = item {
if Some(&func) == me.as_ref() {
continue;
}
func.param_list().into_iter().flat_map(|it| it.params()).for_each(|param| { func.param_list().into_iter().flat_map(|it| it.params()).for_each(|param| {
let text = param.syntax().text().to_string(); let text = param.syntax().text().to_string();
params.entry(text).or_insert((0, param)).0 += 1; params.entry(text).or_insert(param);
}) })
} }
} }
} }
params params
.into_iter() .into_iter()
.filter_map(|(label, (count, param))| { .filter_map(|(label, param)| {
let lookup = param.pat()?.syntax().text().to_string(); let lookup = param.pat()?.syntax().text().to_string();
if count < 2 { Some((label, lookup))
None
} else {
Some((label, lookup))
}
}) })
.for_each(|(label, lookup)| { .for_each(|(label, lookup)| {
CompletionItem::new(CompletionKind::Magic, ctx.source_range(), label) CompletionItem::new(CompletionKind::Magic, ctx.source_range(), label)
@ -83,7 +87,6 @@ fn baz(file<|>) {}
check( check(
r#" r#"
fn foo(file_id: FileId) {} fn foo(file_id: FileId) {}
fn bar(file_id: FileId) {}
fn baz(file<|>, x: i32) {} fn baz(file<|>, x: i32) {}
"#, "#,
expect![[r#" expect![[r#"