diff options
Diffstat (limited to 'crates/ra_ide_api/src/completion/completion_item.rs')
-rw-r--r-- | crates/ra_ide_api/src/completion/completion_item.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs index e3bf82304..8e0be4c4b 100644 --- a/crates/ra_ide_api/src/completion/completion_item.rs +++ b/crates/ra_ide_api/src/completion/completion_item.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | use hir::PerNs; | 1 | use hir::{Docs, Documentation, PerNs}; |
2 | 2 | ||
3 | use crate::completion::completion_context::CompletionContext; | 3 | use crate::completion::completion_context::CompletionContext; |
4 | use ra_syntax::{ | 4 | use ra_syntax::{ |
@@ -19,7 +19,7 @@ pub struct CompletionItem { | |||
19 | label: String, | 19 | label: String, |
20 | kind: Option<CompletionItemKind>, | 20 | kind: Option<CompletionItemKind>, |
21 | detail: Option<String>, | 21 | detail: Option<String>, |
22 | documentation: Option<String>, | 22 | documentation: Option<Documentation>, |
23 | lookup: Option<String>, | 23 | lookup: Option<String>, |
24 | insert_text: Option<String>, | 24 | insert_text: Option<String>, |
25 | insert_text_format: InsertTextFormat, | 25 | insert_text_format: InsertTextFormat, |
@@ -98,7 +98,7 @@ impl CompletionItem { | |||
98 | } | 98 | } |
99 | /// A doc-comment | 99 | /// A doc-comment |
100 | pub fn documentation(&self) -> Option<&str> { | 100 | pub fn documentation(&self) -> Option<&str> { |
101 | self.documentation.as_ref().map(|it| it.as_str()) | 101 | self.documentation.as_ref().map(|it| it.contents()) |
102 | } | 102 | } |
103 | /// What string is used for filtering. | 103 | /// What string is used for filtering. |
104 | pub fn lookup(&self) -> &str { | 104 | pub fn lookup(&self) -> &str { |
@@ -137,7 +137,7 @@ pub(crate) struct Builder { | |||
137 | insert_text: Option<String>, | 137 | insert_text: Option<String>, |
138 | insert_text_format: InsertTextFormat, | 138 | insert_text_format: InsertTextFormat, |
139 | detail: Option<String>, | 139 | detail: Option<String>, |
140 | documentation: Option<String>, | 140 | documentation: Option<Documentation>, |
141 | lookup: Option<String>, | 141 | lookup: Option<String>, |
142 | kind: Option<CompletionItemKind>, | 142 | kind: Option<CompletionItemKind>, |
143 | text_edit: Option<TextEdit>, | 143 | text_edit: Option<TextEdit>, |
@@ -197,10 +197,10 @@ impl Builder { | |||
197 | self | 197 | self |
198 | } | 198 | } |
199 | #[allow(unused)] | 199 | #[allow(unused)] |
200 | pub(crate) fn documentation(self, docs: impl Into<String>) -> Builder { | 200 | pub(crate) fn documentation(self, docs: Documentation) -> Builder { |
201 | self.set_documentation(Some(docs)) | 201 | self.set_documentation(Some(docs)) |
202 | } | 202 | } |
203 | pub(crate) fn set_documentation(mut self, docs: Option<impl Into<String>>) -> Builder { | 203 | pub(crate) fn set_documentation(mut self, docs: Option<Documentation>) -> Builder { |
204 | self.documentation = docs.map(Into::into); | 204 | self.documentation = docs.map(Into::into); |
205 | self | 205 | self |
206 | } | 206 | } |
@@ -265,6 +265,7 @@ impl Builder { | |||
265 | } | 265 | } |
266 | self.insert_text_format = InsertTextFormat::Snippet; | 266 | self.insert_text_format = InsertTextFormat::Snippet; |
267 | } | 267 | } |
268 | |||
268 | if let Some(docs) = function.docs(ctx.db) { | 269 | if let Some(docs) = function.docs(ctx.db) { |
269 | self.documentation = Some(docs); | 270 | self.documentation = Some(docs); |
270 | } | 271 | } |