From 048be5d9a31e2fb005e93c1a1f648d58167622e8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 9 Oct 2019 11:22:17 +0300 Subject: smal cleanup --- crates/ra_ide_api/src/completion/presentation.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs index 400a266a2..aa4890375 100644 --- a/crates/ra_ide_api/src/completion/presentation.rs +++ b/crates/ra_ide_api/src/completion/presentation.rs @@ -44,7 +44,10 @@ impl Completions { ) { use hir::ModuleDef::*; - let mut completion_kind = CompletionKind::Reference; + let completion_kind = match resolution { + ScopeDef::ModuleDef(BuiltinType(..)) => CompletionKind::BuiltinType, + _ => CompletionKind::Reference, + }; let (kind, docs) = match resolution { ScopeDef::ModuleDef(Module(it)) => (CompletionItemKind::Module, it.docs(ctx.db)), ScopeDef::ModuleDef(Function(func)) => { @@ -60,10 +63,7 @@ impl Completions { ScopeDef::ModuleDef(Static(it)) => (CompletionItemKind::Static, it.docs(ctx.db)), ScopeDef::ModuleDef(Trait(it)) => (CompletionItemKind::Trait, it.docs(ctx.db)), ScopeDef::ModuleDef(TypeAlias(it)) => (CompletionItemKind::TypeAlias, it.docs(ctx.db)), - ScopeDef::ModuleDef(BuiltinType(..)) => { - completion_kind = CompletionKind::BuiltinType; - (CompletionItemKind::BuiltinType, None) - } + ScopeDef::ModuleDef(BuiltinType(..)) => (CompletionItemKind::BuiltinType, None), ScopeDef::GenericParam(..) => (CompletionItemKind::TypeParam, None), ScopeDef::LocalBinding(..) => (CompletionItemKind::Binding, None), ScopeDef::AdtSelfType(..) | ScopeDef::ImplSelfType(..) => ( -- cgit v1.2.3 From d9f83d9b16bf871882d7e54419b310e4283c531b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 9 Oct 2019 11:53:32 +0300 Subject: add <> for type aliases as well --- crates/ra_hir/src/lib.rs | 2 +- crates/ra_ide_api/src/completion/presentation.rs | 132 ++++++++++++++--------- 2 files changed, 81 insertions(+), 53 deletions(-) diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 4340e9d34..9cbd9a8ae 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs @@ -71,7 +71,7 @@ pub use self::{ either::Either, expr::ExprScopes, from_source::FromSource, - generics::{GenericParam, GenericParams, HasGenericParams}, + generics::{GenericDef, GenericParam, GenericParams, HasGenericParams}, ids::{HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile}, impl_block::ImplBlock, name::Name, diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs index aa4890375..b7807ef8e 100644 --- a/crates/ra_ide_api/src/completion/presentation.rs +++ b/crates/ra_ide_api/src/completion/presentation.rs @@ -48,44 +48,52 @@ impl Completions { ScopeDef::ModuleDef(BuiltinType(..)) => CompletionKind::BuiltinType, _ => CompletionKind::Reference, }; - let (kind, docs) = match resolution { - ScopeDef::ModuleDef(Module(it)) => (CompletionItemKind::Module, it.docs(ctx.db)), + + let kind = match resolution { + ScopeDef::ModuleDef(Module(..)) => CompletionItemKind::Module, ScopeDef::ModuleDef(Function(func)) => { return self.add_function_with_name(ctx, Some(local_name), *func); } - ScopeDef::ModuleDef(Adt(adt)) => { - return self.add_adt_with_name(ctx, local_name, *adt); - } - ScopeDef::ModuleDef(EnumVariant(it)) => { - (CompletionItemKind::EnumVariant, it.docs(ctx.db)) - } - ScopeDef::ModuleDef(Const(it)) => (CompletionItemKind::Const, it.docs(ctx.db)), - ScopeDef::ModuleDef(Static(it)) => (CompletionItemKind::Static, it.docs(ctx.db)), - ScopeDef::ModuleDef(Trait(it)) => (CompletionItemKind::Trait, it.docs(ctx.db)), - ScopeDef::ModuleDef(TypeAlias(it)) => (CompletionItemKind::TypeAlias, it.docs(ctx.db)), - ScopeDef::ModuleDef(BuiltinType(..)) => (CompletionItemKind::BuiltinType, None), - ScopeDef::GenericParam(..) => (CompletionItemKind::TypeParam, None), - ScopeDef::LocalBinding(..) => (CompletionItemKind::Binding, None), - ScopeDef::AdtSelfType(..) | ScopeDef::ImplSelfType(..) => ( - CompletionItemKind::TypeParam, // (does this need its own kind?) - None, - ), + ScopeDef::ModuleDef(Adt(hir::Adt::Struct(_))) => CompletionItemKind::Struct, + // FIXME: add CompletionItemKind::Union + ScopeDef::ModuleDef(Adt(hir::Adt::Union(_))) => CompletionItemKind::Struct, + ScopeDef::ModuleDef(Adt(hir::Adt::Enum(_))) => CompletionItemKind::Enum, + + ScopeDef::ModuleDef(EnumVariant(..)) => CompletionItemKind::EnumVariant, + ScopeDef::ModuleDef(Const(..)) => CompletionItemKind::Const, + ScopeDef::ModuleDef(Static(..)) => CompletionItemKind::Static, + ScopeDef::ModuleDef(Trait(..)) => CompletionItemKind::Trait, + ScopeDef::ModuleDef(TypeAlias(..)) => CompletionItemKind::TypeAlias, + ScopeDef::ModuleDef(BuiltinType(..)) => CompletionItemKind::BuiltinType, + ScopeDef::GenericParam(..) => CompletionItemKind::TypeParam, + ScopeDef::LocalBinding(..) => CompletionItemKind::Binding, + // (does this need its own kind?) + ScopeDef::AdtSelfType(..) | ScopeDef::ImplSelfType(..) => CompletionItemKind::TypeParam, ScopeDef::MacroDef(mac) => { - self.add_macro(ctx, Some(local_name), *mac); - return; + return self.add_macro(ctx, Some(local_name), *mac); } ScopeDef::Unknown => { - self.add(CompletionItem::new( + return self.add(CompletionItem::new( CompletionKind::Reference, ctx.source_range(), local_name, )); - return; } }; + let docs = match resolution { + ScopeDef::ModuleDef(Module(it)) => it.docs(ctx.db), + ScopeDef::ModuleDef(Adt(it)) => it.docs(ctx.db), + ScopeDef::ModuleDef(EnumVariant(it)) => it.docs(ctx.db), + ScopeDef::ModuleDef(Const(it)) => it.docs(ctx.db), + ScopeDef::ModuleDef(Static(it)) => it.docs(ctx.db), + ScopeDef::ModuleDef(Trait(it)) => it.docs(ctx.db), + ScopeDef::ModuleDef(TypeAlias(it)) => it.docs(ctx.db), + _ => None, + }; + let mut completion_item = - CompletionItem::new(completion_kind, ctx.source_range(), local_name); + CompletionItem::new(completion_kind, ctx.source_range(), local_name.clone()); if let ScopeDef::LocalBinding(pat_id) = resolution { let ty = ctx .analyzer @@ -94,6 +102,25 @@ impl Completions { .map(|t| t.display(ctx.db).to_string()); completion_item = completion_item.set_detail(ty); }; + + // If not an import, add parenthesis automatically. + if ctx.is_path_type + && !ctx.has_type_args + && ctx.db.feature_flags.get("completion.insertion.add-call-parenthesis") + { + let generic_def: Option = match resolution { + ScopeDef::ModuleDef(Adt(it)) => Some((*it).into()), + ScopeDef::ModuleDef(TypeAlias(it)) => Some((*it).into()), + _ => None, + }; + if let Some(def) = generic_def { + if has_non_default_type_params(def, ctx.db) { + tested_by!(inserts_angle_brackets_for_generics); + completion_item = completion_item.insert_snippet(format!("{}<$0>", local_name)); + } + } + } + completion_item.kind(kind).set_documentation(docs).add_to(self) } @@ -169,32 +196,6 @@ impl Completions { self.add(builder) } - fn add_adt_with_name(&mut self, ctx: &CompletionContext, name: String, adt: hir::Adt) { - let mut builder = - CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.clone()); - - let kind = match adt { - hir::Adt::Struct(_) => CompletionItemKind::Struct, - // FIXME: add CompletionItemKind::Union - hir::Adt::Union(_) => CompletionItemKind::Struct, - hir::Adt::Enum(_) => CompletionItemKind::Enum, - }; - let docs = adt.docs(ctx.db); - - // If not an import, add parenthesis automatically. - if ctx.is_path_type - && !ctx.has_type_args - && ctx.db.feature_flags.get("completion.insertion.add-call-parenthesis") - { - if has_non_default_type_params(adt, ctx.db) { - tested_by!(inserts_angle_brackets_for_generics); - builder = builder.insert_snippet(format!("{}<$0>", name)); - } - } - - builder.kind(kind).set_documentation(docs).add_to(self) - } - pub(crate) fn add_const(&mut self, ctx: &CompletionContext, constant: hir::Const) { let ast_node = constant.source(ctx.db).ast; let name = match ast_node.name() { @@ -243,8 +244,8 @@ impl Completions { } } -fn has_non_default_type_params(adt: hir::Adt, db: &db::RootDatabase) -> bool { - let subst = db.generic_defaults(adt.into()); +fn has_non_default_type_params(def: hir::GenericDef, db: &db::RootDatabase) -> bool { + let subst = db.generic_defaults(def); subst.iter().any(|ty| ty == &Ty::Unknown) } @@ -446,6 +447,33 @@ mod tests { ] "### ); + assert_debug_snapshot!( + do_reference_completion( + r" + type Vec = (T,); + fn foo(xs: Ve<|>) + " + ), + @r###" + [ + CompletionItem { + label: "Vec", + source_range: [64; 66), + delete: [64; 66), + insert: "Vec<$0>", + kind: TypeAlias, + }, + CompletionItem { + label: "foo", + source_range: [64; 66), + delete: [64; 66), + insert: "foo($0)", + kind: Function, + detail: "fn foo(xs: Ve)", + }, + ] + "### + ); assert_debug_snapshot!( do_reference_completion( r" -- cgit v1.2.3