1 files changed, 28 insertions, 6 deletions

diff --git a/crates/ra_analysis/src/completion/completion_item.rs b/crates/ra_analysis/src/completion/completion_item.rs
index 7edb86436..4280976e7 100644
--- a/crates/ra_analysis/src/completion/completion_item.rs
+++ b/crates/ra_analysis/src/completion/completion_item.rs
@@ -1,11 +1,13 @@
 #[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>,
+    label: String,
+    lookup: Option<String>,
+    snippet: Option<String>,
+}
+
+pub enum InsertText {
+    PlainText { text: String },
+    Snippet { text: String },
 }
 
 impl CompletionItem {
@@ -17,6 +19,26 @@ impl CompletionItem {
             snippet: None,
         }
     }
+    /// What user sees in pop-up in the UI.
+    pub fn label(&self) -> &str {
+        &self.label
+    }
+    /// What string is used for filtering.
+    pub fn lookup(&self) -> &str {
+        self.lookup
+            .as_ref()
+            .map(|it| it.as_str())
+            .unwrap_or(self.label())
+    }
+    /// What is inserted.
+    pub fn insert_text(&self) -> InsertText {
+        match &self.snippet {
+            None => InsertText::PlainText {
+                text: self.label.clone(),
+            },
+            Some(it) => InsertText::Snippet { text: it.clone() },
+        }
+    }
 }
 
 #[must_use]