diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-19 01:33:49 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-19 01:33:49 +0000 |
commit | 00680a5d7c8f9ab41009d9925cb4c223a86a7615 (patch) | |
tree | a857e7b44a051ce217166de5243d44492ad6d05a /crates/completion/src/render | |
parent | 5231f4b27098d3eee621d2b781a92c6f3e9f267b (diff) | |
parent | ca6548827634155f28e75bc6cb2e734d2d5d1e95 (diff) |
Merge #7342
7342: Show deprecated completions for deprecated traits r=kjeremy a=SomeoneToIgnore
TIL that there are two kinds of deprecation tags and a few details about String methods.
<img width="472" alt="Screenshot 2021-01-19 at 01 11 38" src="https://user-images.githubusercontent.com/2690773/104970200-569d3380-59f3-11eb-9ee3-627b3c8a5c9d.png">
Co-authored-by: Kirill Bulatov <[email protected]>
Diffstat (limited to 'crates/completion/src/render')
-rw-r--r-- | crates/completion/src/render/const_.rs | 5 | ||||
-rw-r--r-- | crates/completion/src/render/function.rs | 4 | ||||
-rw-r--r-- | crates/completion/src/render/type_alias.rs | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/crates/completion/src/render/const_.rs b/crates/completion/src/render/const_.rs index ce924f309..e46452d4e 100644 --- a/crates/completion/src/render/const_.rs +++ b/crates/completion/src/render/const_.rs | |||
@@ -38,7 +38,10 @@ impl<'a> ConstRender<'a> { | |||
38 | let item = CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), name) | 38 | let item = CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), name) |
39 | .kind(CompletionItemKind::Const) | 39 | .kind(CompletionItemKind::Const) |
40 | .set_documentation(self.ctx.docs(self.const_)) | 40 | .set_documentation(self.ctx.docs(self.const_)) |
41 | .set_deprecated(self.ctx.is_deprecated(self.const_)) | 41 | .set_deprecated( |
42 | self.ctx.is_deprecated(self.const_) | ||
43 | || self.ctx.is_deprecated_assoc_item(self.const_), | ||
44 | ) | ||
42 | .detail(detail) | 45 | .detail(detail) |
43 | .build(); | 46 | .build(); |
44 | 47 | ||
diff --git a/crates/completion/src/render/function.rs b/crates/completion/src/render/function.rs index f5b0ce3e3..8f4c66211 100644 --- a/crates/completion/src/render/function.rs +++ b/crates/completion/src/render/function.rs | |||
@@ -44,7 +44,9 @@ impl<'a> FunctionRender<'a> { | |||
44 | CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), self.name.clone()) | 44 | CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), self.name.clone()) |
45 | .kind(self.kind()) | 45 | .kind(self.kind()) |
46 | .set_documentation(self.ctx.docs(self.func)) | 46 | .set_documentation(self.ctx.docs(self.func)) |
47 | .set_deprecated(self.ctx.is_deprecated(self.func)) | 47 | .set_deprecated( |
48 | self.ctx.is_deprecated(self.func) || self.ctx.is_deprecated_assoc_item(self.func), | ||
49 | ) | ||
48 | .detail(self.detail()) | 50 | .detail(self.detail()) |
49 | .add_call_parens(self.ctx.completion, self.name, params) | 51 | .add_call_parens(self.ctx.completion, self.name, params) |
50 | .add_import(import_to_add) | 52 | .add_import(import_to_add) |
diff --git a/crates/completion/src/render/type_alias.rs b/crates/completion/src/render/type_alias.rs index 69b445b9c..29287143a 100644 --- a/crates/completion/src/render/type_alias.rs +++ b/crates/completion/src/render/type_alias.rs | |||
@@ -38,7 +38,10 @@ impl<'a> TypeAliasRender<'a> { | |||
38 | let item = CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), name) | 38 | let item = CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), name) |
39 | .kind(CompletionItemKind::TypeAlias) | 39 | .kind(CompletionItemKind::TypeAlias) |
40 | .set_documentation(self.ctx.docs(self.type_alias)) | 40 | .set_documentation(self.ctx.docs(self.type_alias)) |
41 | .set_deprecated(self.ctx.is_deprecated(self.type_alias)) | 41 | .set_deprecated( |
42 | self.ctx.is_deprecated(self.type_alias) | ||
43 | || self.ctx.is_deprecated_assoc_item(self.type_alias), | ||
44 | ) | ||
42 | .detail(detail) | 45 | .detail(detail) |
43 | .build(); | 46 | .build(); |
44 | 47 | ||