diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-22 15:31:47 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-22 15:31:47 +0000 |
commit | 0c37b3a0fc6d62cd1401320c53feb51a58ea09a6 (patch) | |
tree | 3798ba62e958b1c3642c30e4fab13011171b4837 /crates/completion/src/render/type_alias.rs | |
parent | a5322e3d5b813e4bce7a73762c14bebbd9a36e01 (diff) | |
parent | 08b822b25914bea7405a30383fe43c7235d14346 (diff) |
Merge #7353
7353: Add LifetimeParam and ConstParam to CompletionItemKind r=matklad a=Veykril
Adds `LifetimeParam` and `ConstParam` to `CompletionItemKind` and maps them both to `TypeParam` in the protocol conversion as there are no equivalents, so nothing really changes there.
`ConstParam` could be mapped to `Const` I guess but I'm split on whether that would be better?
Additions were solely inspired by (the single) test output for const params.
Also sorts the variants of `CompletionItemKind` and its to_proto match.
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/completion/src/render/type_alias.rs')
-rw-r--r-- | crates/completion/src/render/type_alias.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crates/completion/src/render/type_alias.rs b/crates/completion/src/render/type_alias.rs index 29287143a..bd97c3692 100644 --- a/crates/completion/src/render/type_alias.rs +++ b/crates/completion/src/render/type_alias.rs | |||
@@ -1,13 +1,14 @@ | |||
1 | //! Renderer for type aliases. | 1 | //! Renderer for type aliases. |
2 | 2 | ||
3 | use hir::HasSource; | 3 | use hir::HasSource; |
4 | use ide_db::SymbolKind; | ||
4 | use syntax::{ | 5 | use syntax::{ |
5 | ast::{NameOwner, TypeAlias}, | 6 | ast::{NameOwner, TypeAlias}, |
6 | display::type_label, | 7 | display::type_label, |
7 | }; | 8 | }; |
8 | 9 | ||
9 | use crate::{ | 10 | use crate::{ |
10 | item::{CompletionItem, CompletionItemKind, CompletionKind}, | 11 | item::{CompletionItem, CompletionKind}, |
11 | render::RenderContext, | 12 | render::RenderContext, |
12 | }; | 13 | }; |
13 | 14 | ||
@@ -36,7 +37,7 @@ impl<'a> TypeAliasRender<'a> { | |||
36 | let detail = self.detail(); | 37 | let detail = self.detail(); |
37 | 38 | ||
38 | let item = CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), name) | 39 | let item = CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), name) |
39 | .kind(CompletionItemKind::TypeAlias) | 40 | .kind(SymbolKind::TypeAlias) |
40 | .set_documentation(self.ctx.docs(self.type_alias)) | 41 | .set_documentation(self.ctx.docs(self.type_alias)) |
41 | .set_deprecated( | 42 | .set_deprecated( |
42 | self.ctx.is_deprecated(self.type_alias) | 43 | self.ctx.is_deprecated(self.type_alias) |