2 files changed, 47 insertions, 5 deletions

diff --git a/crates/ra_analysis/src/completion/completion_item.rs b/crates/ra_analysis/src/completion/completion_item.rs
new file mode 100644
index 000000000..309b0108d
--- /dev/null
+++ b/crates/ra_analysis/src/completion/completion_item.rs
@@ -0,0 +1,44 @@
+#[derive(Debug)]
+pub struct CompletionItem {
+    /// What user sees in pop-up in the UI.
+    pub label: String,
+    /// What string is used for filtering, defaults to label.
+    pub lookup: Option<String>,
+    /// What is inserted, defaults to label.
+    pub snippet: Option<String>,
+}
+
+impl CompletionItem {
+    pub(crate) fn new(label: impl Into<String>) -> Builder {
+        let label = label.into();
+        Builder {
+            label,
+            lookup: None,
+            snippet: None,
+        }
+    }
+}
+
+pub(crate) struct Builder {
+    label: String,
+    lookup: Option<String>,
+    snippet: Option<String>,
+}
+
+impl Builder {
+    pub fn add_to(self, acc: &mut Vec<CompletionItem>) {
+        acc.push(self.build())
+    }
+
+    pub fn build(self) -> CompletionItem {
+        CompletionItem {
+            label: self.label,
+            lookup: self.lookup,
+            snippet: self.snippet,
+        }
+    }
+    pub fn lookup_by(mut self, lookup: impl Into<String>) -> Builder {
+        self.lookup = Some(lookup.into());
+        self
+    }
+}
diff --git a/crates/ra_analysis/src/completion/reference_completion.rs b/crates/ra_analysis/src/completion/reference_completion.rs
index f483ed045..457ca13cc 100644
--- a/crates/ra_analysis/src/completion/reference_completion.rs
+++ b/crates/ra_analysis/src/completion/reference_completion.rs
@@ -6,11 +6,9 @@ use ra_syntax::{
     ast::{self, LoopBodyOwner},
     SyntaxKind::*,
 };
-use     hir::{
-        self,
-        FnScopes,
-        Def,
-        Path,
+use hir::{
+    self,
+    FnScopes, Def, Path
 };
 
 use crate::{