From 83e49200d82dccda54bbf376bba5a9c75da14cab Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Tue, 19 Jan 2021 20:21:56 +0100 Subject: Add LifetimeParam and ConstParam to CompletionItemKind --- crates/completion/src/render.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crates/completion/src/render.rs') diff --git a/crates/completion/src/render.rs b/crates/completion/src/render.rs index 4f622d28a..68556c8ce 100644 --- a/crates/completion/src/render.rs +++ b/crates/completion/src/render.rs @@ -208,7 +208,11 @@ impl<'a> Render<'a> { ScopeDef::ModuleDef(Trait(..)) => CompletionItemKind::Trait, ScopeDef::ModuleDef(TypeAlias(..)) => CompletionItemKind::TypeAlias, ScopeDef::ModuleDef(BuiltinType(..)) => CompletionItemKind::BuiltinType, - ScopeDef::GenericParam(..) => CompletionItemKind::TypeParam, + ScopeDef::GenericParam(param) => match param { + hir::GenericParam::TypeParam(_) => CompletionItemKind::TypeParam, + hir::GenericParam::LifetimeParam(_) => CompletionItemKind::LifetimeParam, + hir::GenericParam::ConstParam(_) => CompletionItemKind::ConstParam, + }, ScopeDef::Local(..) => CompletionItemKind::Binding, // (does this need its own kind?) ScopeDef::AdtSelfType(..) | ScopeDef::ImplSelfType(..) => CompletionItemKind::TypeParam, -- cgit v1.2.3 From f2cb7dbcb71d81336c95dc7ae1301ba2a79ef707 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Wed, 20 Jan 2021 18:38:12 +0100 Subject: Partially unify SymbolKind and CompletionItemKind --- crates/completion/src/render.rs | 47 +++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 21 deletions(-) (limited to 'crates/completion/src/render.rs') diff --git a/crates/completion/src/render.rs b/crates/completion/src/render.rs index 68556c8ce..8f66f6e59 100644 --- a/crates/completion/src/render.rs +++ b/crates/completion/src/render.rs @@ -13,7 +13,7 @@ mod builder_ext; use hir::{ AsAssocItem, Documentation, HasAttrs, HirDisplay, ModuleDef, Mutability, ScopeDef, Type, }; -use ide_db::{helpers::SnippetCap, RootDatabase}; +use ide_db::{helpers::SnippetCap, RootDatabase, SymbolKind}; use syntax::TextRange; use test_utils::mark; @@ -146,7 +146,7 @@ impl<'a> Render<'a> { self.ctx.source_range(), name.to_string(), ) - .kind(CompletionItemKind::Field) + .kind(SymbolKind::Field) .detail(ty.display(self.ctx.db()).to_string()) .set_documentation(field.docs(self.ctx.db())) .set_deprecated(is_deprecated); @@ -160,7 +160,7 @@ impl<'a> Render<'a> { fn add_tuple_field(&mut self, field: usize, ty: &Type) -> CompletionItem { CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), field.to_string()) - .kind(CompletionItemKind::Field) + .kind(SymbolKind::Field) .detail(ty.display(self.ctx.db()).to_string()) .build() } @@ -187,7 +187,7 @@ impl<'a> Render<'a> { if self.ctx.completion.is_pat_binding_or_const | self.ctx.completion.is_irrefutable_pat_binding => { - CompletionItemKind::EnumVariant + CompletionItemKind::SymbolKind(SymbolKind::Variant) } ScopeDef::ModuleDef(Variant(var)) => { let item = render_variant(self.ctx, import_to_add, Some(local_name), *var, None); @@ -198,24 +198,29 @@ impl<'a> Render<'a> { return item; } - ScopeDef::ModuleDef(Module(..)) => CompletionItemKind::Module, - 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(Const(..)) => CompletionItemKind::Const, - ScopeDef::ModuleDef(Static(..)) => CompletionItemKind::Static, - ScopeDef::ModuleDef(Trait(..)) => CompletionItemKind::Trait, - ScopeDef::ModuleDef(TypeAlias(..)) => CompletionItemKind::TypeAlias, + ScopeDef::ModuleDef(Module(..)) => CompletionItemKind::SymbolKind(SymbolKind::Module), + ScopeDef::ModuleDef(Adt(adt)) => CompletionItemKind::SymbolKind(match adt { + hir::Adt::Struct(_) => SymbolKind::Struct, + // FIXME: add CompletionItemKind::Union + hir::Adt::Union(_) => SymbolKind::Struct, + hir::Adt::Enum(_) => SymbolKind::Enum, + }), + ScopeDef::ModuleDef(Const(..)) => CompletionItemKind::SymbolKind(SymbolKind::Const), + ScopeDef::ModuleDef(Static(..)) => CompletionItemKind::SymbolKind(SymbolKind::Static), + ScopeDef::ModuleDef(Trait(..)) => CompletionItemKind::SymbolKind(SymbolKind::Trait), + ScopeDef::ModuleDef(TypeAlias(..)) => { + CompletionItemKind::SymbolKind(SymbolKind::TypeAlias) + } ScopeDef::ModuleDef(BuiltinType(..)) => CompletionItemKind::BuiltinType, - ScopeDef::GenericParam(param) => match param { - hir::GenericParam::TypeParam(_) => CompletionItemKind::TypeParam, - hir::GenericParam::LifetimeParam(_) => CompletionItemKind::LifetimeParam, - hir::GenericParam::ConstParam(_) => CompletionItemKind::ConstParam, - }, - ScopeDef::Local(..) => CompletionItemKind::Binding, - // (does this need its own kind?) - ScopeDef::AdtSelfType(..) | ScopeDef::ImplSelfType(..) => CompletionItemKind::TypeParam, + ScopeDef::GenericParam(param) => CompletionItemKind::SymbolKind(match param { + hir::GenericParam::TypeParam(_) => SymbolKind::TypeParam, + hir::GenericParam::LifetimeParam(_) => SymbolKind::LifetimeParam, + hir::GenericParam::ConstParam(_) => SymbolKind::ConstParam, + }), + ScopeDef::Local(..) => CompletionItemKind::SymbolKind(SymbolKind::Local), + ScopeDef::AdtSelfType(..) | ScopeDef::ImplSelfType(..) => { + CompletionItemKind::SymbolKind(SymbolKind::SelfParam) + } ScopeDef::Unknown => { let item = CompletionItem::new( CompletionKind::Reference, -- cgit v1.2.3 From 08b822b25914bea7405a30383fe43c7235d14346 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Wed, 20 Jan 2021 18:46:14 +0100 Subject: Update completions test output --- crates/completion/src/render.rs | 64 ++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 17 deletions(-) (limited to 'crates/completion/src/render.rs') diff --git a/crates/completion/src/render.rs b/crates/completion/src/render.rs index 8f66f6e59..fa594b5e5 100644 --- a/crates/completion/src/render.rs +++ b/crates/completion/src/render.rs @@ -409,7 +409,9 @@ fn main() { Foo::Fo$0 } source_range: 54..56, delete: 54..56, insert: "Foo", - kind: EnumVariant, + kind: SymbolKind( + Variant, + ), detail: "{ x: i32, y: i32 }", }, ] @@ -432,7 +434,9 @@ fn main() { Foo::Fo$0 } source_range: 46..48, delete: 46..48, insert: "Foo($0)", - kind: EnumVariant, + kind: SymbolKind( + Variant, + ), lookup: "Foo", detail: "(i32, i32)", trigger_call_info: true, @@ -457,7 +461,9 @@ fn main() { Foo::Fo$0 } source_range: 35..37, delete: 35..37, insert: "Foo", - kind: EnumVariant, + kind: SymbolKind( + Variant, + ), detail: "()", }, ] @@ -481,7 +487,9 @@ fn main() { let _: m::Spam = S$0 } source_range: 75..76, delete: 75..76, insert: "Spam::Bar($0)", - kind: EnumVariant, + kind: SymbolKind( + Variant, + ), lookup: "Spam::Bar", detail: "(i32)", trigger_call_info: true, @@ -491,14 +499,18 @@ fn main() { let _: m::Spam = S$0 } source_range: 75..76, delete: 75..76, insert: "m", - kind: Module, + kind: SymbolKind( + Module, + ), }, CompletionItem { label: "m::Spam::Foo", source_range: 75..76, delete: 75..76, insert: "m::Spam::Foo", - kind: EnumVariant, + kind: SymbolKind( + Variant, + ), lookup: "Spam::Foo", detail: "()", }, @@ -507,7 +519,9 @@ fn main() { let _: m::Spam = S$0 } source_range: 75..76, delete: 75..76, insert: "main()$0", - kind: Function, + kind: SymbolKind( + Function, + ), lookup: "main", detail: "fn main()", }, @@ -534,7 +548,9 @@ fn main() { som$0 } source_range: 127..130, delete: 127..130, insert: "main()$0", - kind: Function, + kind: SymbolKind( + Function, + ), lookup: "main", detail: "fn main()", }, @@ -543,7 +559,9 @@ fn main() { som$0 } source_range: 127..130, delete: 127..130, insert: "something_deprecated()$0", - kind: Function, + kind: SymbolKind( + Function, + ), lookup: "something_deprecated", detail: "fn something_deprecated()", deprecated: true, @@ -553,7 +571,9 @@ fn main() { som$0 } source_range: 127..130, delete: 127..130, insert: "something_else_deprecated()$0", - kind: Function, + kind: SymbolKind( + Function, + ), lookup: "something_else_deprecated", detail: "fn something_else_deprecated()", deprecated: true, @@ -574,7 +594,9 @@ fn foo() { A { the$0 } } source_range: 57..60, delete: 57..60, insert: "the_field", - kind: Field, + kind: SymbolKind( + Field, + ), detail: "u32", deprecated: true, }, @@ -614,7 +636,9 @@ impl S { source_range: 94..94, delete: 94..94, insert: "foo", - kind: Field, + kind: SymbolKind( + Field, + ), detail: "{unknown}", documentation: Documentation( "Field docs", @@ -645,7 +669,9 @@ use self::E::*; source_range: 10..12, delete: 10..12, insert: "E", - kind: Enum, + kind: SymbolKind( + Enum, + ), documentation: Documentation( "enum docs", ), @@ -655,7 +681,9 @@ use self::E::*; source_range: 10..12, delete: 10..12, insert: "V", - kind: EnumVariant, + kind: SymbolKind( + Variant, + ), detail: "()", documentation: Documentation( "variant docs", @@ -666,7 +694,9 @@ use self::E::*; source_range: 10..12, delete: 10..12, insert: "my", - kind: Module, + kind: SymbolKind( + Module, + ), documentation: Documentation( "mod docs", ), @@ -892,7 +922,7 @@ struct WorldSnapshot { _f: () }; fn go(world: &WorldSnapshot) { go(w$0) } "#, expect![[r#" - bn world [type+name] + lc world [type+name] st WorldSnapshot [] fn go(…) [] "#]], @@ -909,7 +939,7 @@ fn f(foo: &Foo) { f(foo, w$0) } expect![[r#" st Foo [] fn f(…) [] - bn foo [] + lc foo [] "#]], ); } -- cgit v1.2.3