diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-11 22:13:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 22:13:28 +0100 |
| commit | 72ea02869b94caf6dd450e17c4998357849ab3c5 (patch) | |
| tree | 96ed1a934bc81f2d8f7c47d9e09eef786a2bf5fe /crates/ide_completion/src/render | |
| parent | 187d55a25eed40fce2b43eaa7cf783f36c69035a (diff) | |
| parent | ec9ef9c28325ca8d2c520d4316e2d82281c0cbf1 (diff) | |
Merge #9223
9223: Complete associated types in dyn and impl trait r=Veykril a=Veykril
Fixes #9222
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Diffstat (limited to 'crates/ide_completion/src/render')
| -rw-r--r-- | crates/ide_completion/src/render/type_alias.rs | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/crates/ide_completion/src/render/type_alias.rs b/crates/ide_completion/src/render/type_alias.rs index e47b4c745..e0234171a 100644 --- a/crates/ide_completion/src/render/type_alias.rs +++ b/crates/ide_completion/src/render/type_alias.rs | |||
| @@ -16,7 +16,14 @@ pub(crate) fn render_type_alias<'a>( | |||
| 16 | ctx: RenderContext<'a>, | 16 | ctx: RenderContext<'a>, |
| 17 | type_alias: hir::TypeAlias, | 17 | type_alias: hir::TypeAlias, |
| 18 | ) -> Option<CompletionItem> { | 18 | ) -> Option<CompletionItem> { |
| 19 | TypeAliasRender::new(ctx, type_alias)?.render() | 19 | TypeAliasRender::new(ctx, type_alias)?.render(false) |
| 20 | } | ||
| 21 | |||
| 22 | pub(crate) fn render_type_alias_with_eq<'a>( | ||
| 23 | ctx: RenderContext<'a>, | ||
| 24 | type_alias: hir::TypeAlias, | ||
| 25 | ) -> Option<CompletionItem> { | ||
| 26 | TypeAliasRender::new(ctx, type_alias)?.render(true) | ||
| 20 | } | 27 | } |
| 21 | 28 | ||
| 22 | #[derive(Debug)] | 29 | #[derive(Debug)] |
| @@ -32,8 +39,14 @@ impl<'a> TypeAliasRender<'a> { | |||
| 32 | Some(TypeAliasRender { ctx, type_alias, ast_node }) | 39 | Some(TypeAliasRender { ctx, type_alias, ast_node }) |
| 33 | } | 40 | } |
| 34 | 41 | ||
| 35 | fn render(self) -> Option<CompletionItem> { | 42 | fn render(self, with_eq: bool) -> Option<CompletionItem> { |
| 36 | let name = self.name()?; | 43 | let name = self.ast_node.name().map(|name| { |
| 44 | if with_eq { | ||
| 45 | format!("{} = ", name.text()) | ||
| 46 | } else { | ||
| 47 | name.text().to_string() | ||
| 48 | } | ||
| 49 | })?; | ||
| 37 | let detail = self.detail(); | 50 | let detail = self.detail(); |
| 38 | 51 | ||
| 39 | let mut item = | 52 | let mut item = |
| @@ -49,10 +62,6 @@ impl<'a> TypeAliasRender<'a> { | |||
| 49 | Some(item.build()) | 62 | Some(item.build()) |
| 50 | } | 63 | } |
| 51 | 64 | ||
| 52 | fn name(&self) -> Option<String> { | ||
| 53 | self.ast_node.name().map(|name| name.text().to_string()) | ||
| 54 | } | ||
| 55 | |||
| 56 | fn detail(&self) -> String { | 65 | fn detail(&self) -> String { |
| 57 | type_label(&self.ast_node) | 66 | type_label(&self.ast_node) |
| 58 | } | 67 | } |