Merge #854

854: more compact edits in insta r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

59 files changed, 522 insertions, 433 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_keyword.rs b/crates/ra_ide_api/src/completion/complete_keyword.rs
index 10ae01bc5..b667381a7 100644
--- a/crates/ra_ide_api/src/completion/complete_keyword.rs
+++ b/crates/ra_ide_api/src/completion/complete_keyword.rs
@@ -40,7 +40,7 @@ pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
 fn keyword(ctx: &CompletionContext, kw: &str, snippet: &str) -> CompletionItem {
     CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), kw)
         .kind(CompletionItemKind::Keyword)
-        .snippet(snippet)
+        .insert_snippet(snippet)
         .build()
 }
 
diff --git a/crates/ra_ide_api/src/completion/complete_postfix.rs b/crates/ra_ide_api/src/completion/complete_postfix.rs
index cf8c63269..ce3d6ed3c 100644
--- a/crates/ra_ide_api/src/completion/complete_postfix.rs
+++ b/crates/ra_ide_api/src/completion/complete_postfix.rs
@@ -16,15 +16,16 @@ use ra_syntax::{
 use ra_text_edit::TextEditBuilder;
 
 fn postfix_snippet(ctx: &CompletionContext, label: &str, detail: &str, snippet: &str) -> Builder {
-    let replace_range = ctx.source_range();
-    let receiver_range = ctx.dot_receiver.expect("no receiver available").syntax().range();
-    let delete_range = TextRange::from_to(receiver_range.start(), replace_range.start());
-    let mut builder = TextEditBuilder::default();
-    builder.delete(delete_range);
-    CompletionItem::new(CompletionKind::Postfix, replace_range, label)
-        .snippet(snippet)
+    let edit = {
+        let receiver_range = ctx.dot_receiver.expect("no receiver available").syntax().range();
+        let delete_range = TextRange::from_to(receiver_range.start(), ctx.source_range().end());
+        let mut builder = TextEditBuilder::default();
+        builder.replace(delete_range, snippet.to_string());
+        builder.finish()
+    };
+    CompletionItem::new(CompletionKind::Postfix, ctx.source_range(), label)
         .detail(detail)
-        .text_edit(builder.finish())
+        .snippet_edit(edit)
 }
 
 pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
diff --git a/crates/ra_ide_api/src/completion/complete_snippet.rs b/crates/ra_ide_api/src/completion/complete_snippet.rs
index d1cea7375..aa3a16fa2 100644
--- a/crates/ra_ide_api/src/completion/complete_snippet.rs
+++ b/crates/ra_ide_api/src/completion/complete_snippet.rs
@@ -2,7 +2,7 @@ use crate::completion::{CompletionItem, Completions, CompletionKind, CompletionI
 
 fn snippet(ctx: &CompletionContext, label: &str, snippet: &str) -> Builder {
     CompletionItem::new(CompletionKind::Snippet, ctx.source_range(), label)
-        .snippet(snippet)
+        .insert_snippet(snippet)
         .kind(CompletionItemKind::Snippet)
 }
 
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs
index 7b93b5df8..95bdd59b4 100644
--- a/crates/ra_ide_api/src/completion/completion_item.rs
+++ b/crates/ra_ide_api/src/completion/completion_item.rs
@@ -2,7 +2,7 @@ use std::fmt;
 
 use hir::{Docs, Documentation, PerNs, Resolution};
 use ra_syntax::TextRange;
-use ra_text_edit::TextEdit;
+use ra_text_edit::{ TextEditBuilder, TextEdit};
 use test_utils::tested_by;
 
 use crate::completion::{
@@ -17,29 +17,53 @@ use crate::completion::{
 /// `CompletionItem`, use `new` method and the `Builder` struct.
 pub struct CompletionItem {
     /// Used only internally in tests, to check only specific kind of
-    /// completion.
+    /// completion (postfix, keyword, reference, etc).
     #[allow(unused)]
     completion_kind: CompletionKind,
+    /// Label in the completion pop up which identifies completion.
     label: String,
+    /// Range of identifier that is being completed.
+    ///
+    /// It should be used primarily for UI, but we also use this to convert
+    /// genetic TextEdit into LSP's completion edit (see conv.rs).
+    ///
+    /// `source_range` must contain the completion offset. `insert_text` should
+    /// start with what `source_range` points to, or VSCode will filter out the
+    /// completion silently.
+    source_range: TextRange,
+    /// What happens when user selects this item.
+    ///
+    /// Typically, replaces `source_range` with new identifier.
+    text_edit: TextEdit,
+    insert_text_format: InsertTextFormat,
+
+    /// What item (struct, function, etc) are we completing.
     kind: Option<CompletionItemKind>,
+
+    /// Lookup is used to check if completion item indeed can complete current
+    /// ident.
+    ///
+    /// That is, in `foo.bar<|>` lookup of `abracadabra` will be accepted (it
+    /// contains `bar` sub sequence), and `quux` will rejected.
     lookup: Option<String>,
+
+    /// Additional info to show in the UI pop up.
     detail: Option<String>,
     documentation: Option<Documentation>,
-    insert_text: Option<String>,
-    insert_text_format: InsertTextFormat,
-    /// Where completion occurs. `source_range` must contain the completion offset.
-    /// `insert_text` should start with what `source_range` points to, or VSCode
-    /// will filter out the completion silently.
-    source_range: TextRange,
-    /// Additional text edit, ranges in `text_edit` must never intersect with `source_range`.
-    /// Or VSCode will drop it silently.
-    text_edit: Option<TextEdit>,
 }
 
+// We use custom debug for CompletionItem to make `insta`'s diffs more readable.
 impl fmt::Debug for CompletionItem {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let mut s = f.debug_struct("CompletionItem");
         s.field("label", &self.label()).field("source_range", &self.source_range());
+        if self.text_edit().as_atoms().len() == 1 {
+            let atom = &self.text_edit().as_atoms()[0];
+            s.field("delete", &atom.delete);
+            s.field("insert", &atom.insert);
+        } else {
+            s.field("text_edit", &self.text_edit);
+        }
         if let Some(kind) = self.kind().as_ref() {
             s.field("kind", kind);
         }
@@ -52,13 +76,6 @@ impl fmt::Debug for CompletionItem {
         if let Some(documentation) = self.documentation() {
             s.field("documentation", &documentation);
         }
-        if self.insert_text() != self.label() {
-            s.field("insert_text", &self.insert_text())
-                .field("insert_text_format", &self.insert_text_format());
-        }
-        if let Some(edit) = self.text_edit.as_ref() {
-            s.field("text_edit", edit);
-        }
         s.finish()
     }
 }
@@ -103,12 +120,12 @@ pub enum InsertTextFormat {
 impl CompletionItem {
     pub(crate) fn new(
         completion_kind: CompletionKind,
-        replace_range: TextRange,
+        source_range: TextRange,
         label: impl Into<String>,
     ) -> Builder {
         let label = label.into();
         Builder {
-            source_range: replace_range,
+            source_range,
             completion_kind,
             label,
             insert_text: None,
@@ -124,6 +141,18 @@ impl CompletionItem {
     pub fn label(&self) -> &str {
         &self.label
     }
+    pub fn source_range(&self) -> TextRange {
+        self.source_range
+    }
+
+    pub fn insert_text_format(&self) -> InsertTextFormat {
+        self.insert_text_format
+    }
+
+    pub fn text_edit(&self) -> &TextEdit {
+        &self.text_edit
+    }
+
     /// Short one-line additional information, like a type
     pub fn detail(&self) -> Option<&str> {
         self.detail.as_ref().map(|it| it.as_str())
@@ -137,24 +166,9 @@ impl CompletionItem {
         self.lookup.as_ref().map(|it| it.as_str()).unwrap_or_else(|| self.label())
     }
 
-    pub fn insert_text_format(&self) -> InsertTextFormat {
-        self.insert_text_format
-    }
-    pub fn insert_text(&self) -> String {
-        match &self.insert_text {
-            Some(t) => t.clone(),
-            None => self.label.clone(),
-        }
-    }
     pub fn kind(&self) -> Option<CompletionItemKind> {
         self.kind
     }
-    pub fn take_text_edit(&mut self) -> Option<TextEdit> {
-        self.text_edit.take()
-    }
-    pub fn source_range(&self) -> TextRange {
-        self.source_range
-    }
 }
 
 /// A helper to make `CompletionItem`s.
@@ -178,17 +192,27 @@ impl Builder {
     }
 
     pub(crate) fn build(self) -> CompletionItem {
+        let label = self.label;
+        let text_edit = match self.text_edit {
+            Some(it) => it,
+            None => {
+                let mut builder = TextEditBuilder::default();
+                builder
+                    .replace(self.source_range, self.insert_text.unwrap_or_else(|| label.clone()));
+                builder.finish()
+            }
+        };
+
         CompletionItem {
             source_range: self.source_range,
-            label: self.label,
+            label,
+            insert_text_format: self.insert_text_format,
+            text_edit,
             detail: self.detail,
             documentation: self.documentation,
-            insert_text_format: self.insert_text_format,
             lookup: self.lookup,
             kind: self.kind,
             completion_kind: self.completion_kind,
-            text_edit: self.text_edit,
-            insert_text: self.insert_text,
         }
     }
     pub(crate) fn lookup_by(mut self, lookup: impl Into<String>) -> Builder {
@@ -199,12 +223,7 @@ impl Builder {
         self.insert_text = Some(insert_text.into());
         self
     }
-    #[allow(unused)]
-    pub(crate) fn insert_text_format(mut self, insert_text_format: InsertTextFormat) -> Builder {
-        self.insert_text_format = insert_text_format;
-        self
-    }
-    pub(crate) fn snippet(mut self, snippet: impl Into<String>) -> Builder {
+    pub(crate) fn insert_snippet(mut self, snippet: impl Into<String>) -> Builder {
         self.insert_text_format = InsertTextFormat::Snippet;
         self.insert_text(snippet)
     }
@@ -212,11 +231,14 @@ impl Builder {
         self.kind = Some(kind);
         self
     }
-    #[allow(unused)]
     pub(crate) fn text_edit(mut self, edit: TextEdit) -> Builder {
         self.text_edit = Some(edit);
         self
     }
+    pub(crate) fn snippet_edit(mut self, edit: TextEdit) -> Builder {
+        self.insert_text_format = InsertTextFormat::Snippet;
+        self.text_edit(edit)
+    }
     #[allow(unused)]
     pub(crate) fn detail(self, detail: impl Into<String>) -> Builder {
         self.set_detail(Some(detail))
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
index 799daa724..bd7f99f71 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.736783986Z"
+created: "2019-02-18T09:22:24.132341107Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,14 +8,16 @@ expression: kind_completions
     CompletionItem {
         label: "quux",
         source_range: [83; 83),
+        delete: [83; 83),
+        insert: "quux()$0",
         kind: Function,
-        detail: "fn quux()",
-        insert_text: "quux()$0",
-        insert_text_format: Snippet
+        detail: "fn quux()"
     },
     CompletionItem {
         label: "x",
         source_range: [83; 83),
+        delete: [83; 83),
+        insert: "x",
         kind: Binding
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
index e6c1a936a..3b374c4de 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.739513594Z"
+created: "2019-02-18T09:22:24.126809445Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,19 +8,23 @@ expression: kind_completions
     CompletionItem {
         label: "a",
         source_range: [214; 214),
+        delete: [214; 214),
+        insert: "a",
         kind: Binding
     },
     CompletionItem {
         label: "b",
         source_range: [214; 214),
+        delete: [214; 214),
+        insert: "b",
         kind: Binding
     },
     CompletionItem {
         label: "quux",
         source_range: [214; 214),
+        delete: [214; 214),
+        insert: "quux()$0",
         kind: Function,
-        detail: "fn quux()",
-        insert_text: "quux()$0",
-        insert_text_format: Snippet
+        detail: "fn quux()"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
index 2b0da7d73..173f5319a 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.739513592Z"
+created: "2019-02-18T09:22:24.126696322Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,19 +8,23 @@ expression: kind_completions
     CompletionItem {
         label: "quux",
         source_range: [79; 79),
+        delete: [79; 79),
+        insert: "quux($0)",
         kind: Function,
-        detail: "fn quux(x: i32)",
-        insert_text: "quux($0)",
-        insert_text_format: Snippet
+        detail: "fn quux(x: i32)"
     },
     CompletionItem {
         label: "x",
         source_range: [79; 79),
+        delete: [79; 79),
+        insert: "x",
         kind: Binding
     },
     CompletionItem {
         label: "y",
         source_range: [79; 79),
+        delete: [79; 79),
+        insert: "y",
         kind: Binding
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap
index 5d62a6cb0..42ff02469 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops1.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.630948152Z"
+created: "2019-02-18T09:22:23.976673150Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,50 +8,50 @@ expression: kind_completions
     CompletionItem {
         label: "break",
         source_range: [55; 55),
-        kind: Keyword,
-        insert_text: "break;",
-        insert_text_format: Snippet
+        delete: [55; 55),
+        insert: "break;",
+        kind: Keyword
     },
     CompletionItem {
         label: "continue",
         source_range: [55; 55),
-        kind: Keyword,
-        insert_text: "continue;",
-        insert_text_format: Snippet
+        delete: [55; 55),
+        insert: "continue;",
+        kind: Keyword
     },
     CompletionItem {
         label: "if",
         source_range: [55; 55),
-        kind: Keyword,
-        insert_text: "if $0 {}",
-        insert_text_format: Snippet
+        delete: [55; 55),
+        insert: "if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "loop",
         source_range: [55; 55),
-        kind: Keyword,
-        insert_text: "loop {$0}",
-        insert_text_format: Snippet
+        delete: [55; 55),
+        insert: "loop {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "match",
         source_range: [55; 55),
-        kind: Keyword,
-        insert_text: "match $0 {}",
-        insert_text_format: Snippet
+        delete: [55; 55),
+        insert: "match $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "return",
         source_range: [55; 55),
-        kind: Keyword,
-        insert_text: "return $0;",
-        insert_text_format: Snippet
+        delete: [55; 55),
+        insert: "return $0;",
+        kind: Keyword
     },
     CompletionItem {
         label: "while",
         source_range: [55; 55),
-        kind: Keyword,
-        insert_text: "while $0 {}",
-        insert_text_format: Snippet
+        delete: [55; 55),
+        insert: "while $0 {}",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap
index aeedd0e80..057ff8a7a 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_break_and_continue_in_loops2.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.662074625Z"
+created: "2019-02-18T09:22:24.068967569Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,36 +8,36 @@ expression: kind_completions
     CompletionItem {
         label: "if",
         source_range: [60; 60),
-        kind: Keyword,
-        insert_text: "if $0 {}",
-        insert_text_format: Snippet
+        delete: [60; 60),
+        insert: "if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "loop",
         source_range: [60; 60),
-        kind: Keyword,
-        insert_text: "loop {$0}",
-        insert_text_format: Snippet
+        delete: [60; 60),
+        insert: "loop {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "match",
         source_range: [60; 60),
-        kind: Keyword,
-        insert_text: "match $0 {}",
-        insert_text_format: Snippet
+        delete: [60; 60),
+        insert: "match $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "return",
         source_range: [60; 60),
-        kind: Keyword,
-        insert_text: "return $0;",
-        insert_text_format: Snippet
+        delete: [60; 60),
+        insert: "return $0;",
+        kind: Keyword
     },
     CompletionItem {
         label: "while",
         source_range: [60; 60),
-        kind: Keyword,
-        insert_text: "while $0 {}",
-        insert_text_format: Snippet
+        delete: [60; 60),
+        insert: "while $0 {}",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap
index a22205dad..16126ee77 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.774580359Z"
+created: "2019-02-18T09:22:24.180517434Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,19 +8,23 @@ expression: kind_completions
     CompletionItem {
         label: "Option",
         source_range: [18; 18),
+        delete: [18; 18),
+        insert: "Option",
         kind: Struct
     },
     CompletionItem {
         label: "foo",
         source_range: [18; 18),
+        delete: [18; 18),
+        insert: "foo()$0",
         kind: Function,
-        detail: "fn foo()",
-        insert_text: "foo()$0",
-        insert_text_format: Snippet
+        detail: "fn foo()"
     },
     CompletionItem {
         label: "std",
         source_range: [18; 18),
+        delete: [18; 18),
+        insert: "std",
         kind: Module
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_use_paths_across_crates.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_use_paths_across_crates.snap
index fcbb592e1..2420e7744 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_use_paths_across_crates.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_use_paths_across_crates.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.729954589Z"
+created: "2019-02-18T09:22:24.118807216Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "bar",
         source_range: [9; 9),
+        delete: [9; 9),
+        insert: "bar",
         kind: Module
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap
index 3c5460319..c472f7965 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__deeply_nested_use_tree.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.663233766Z"
+created: "2019-02-18T09:22:24.044567777Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "Spam",
         source_range: [23; 25),
+        delete: [23; 25),
+        insert: "Spam",
         kind: Struct
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap
index 493684e5b..97bd76c49 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_add_semi_after_return_if_not_a_statement.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.637726929Z"
+created: "2019-02-18T09:22:23.987788705Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,36 +8,36 @@ expression: kind_completions
     CompletionItem {
         label: "if",
         source_range: [85; 85),
-        kind: Keyword,
-        insert_text: "if $0 {}",
-        insert_text_format: Snippet
+        delete: [85; 85),
+        insert: "if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "loop",
         source_range: [85; 85),
-        kind: Keyword,
-        insert_text: "loop {$0}",
-        insert_text_format: Snippet
+        delete: [85; 85),
+        insert: "loop {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "match",
         source_range: [85; 85),
-        kind: Keyword,
-        insert_text: "match $0 {}",
-        insert_text_format: Snippet
+        delete: [85; 85),
+        insert: "match $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "return",
         source_range: [85; 85),
-        kind: Keyword,
-        insert_text: "return $0",
-        insert_text_format: Snippet
+        delete: [85; 85),
+        insert: "return $0",
+        kind: Keyword
     },
     CompletionItem {
         label: "while",
         source_range: [85; 85),
-        kind: Keyword,
-        insert_text: "while $0 {}",
-        insert_text_format: Snippet
+        delete: [85; 85),
+        insert: "while $0 {}",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
index 4e37dbef1..1de0efb5b 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.812347626Z"
+created: "2019-02-18T09:22:24.211680376Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,12 +8,16 @@ expression: kind_completions
     CompletionItem {
         label: "frobnicate",
         source_range: [35; 39),
+        delete: [35; 39),
+        insert: "frobnicate",
         kind: Function,
         detail: "fn frobnicate()"
     },
     CompletionItem {
         label: "main",
         source_range: [35; 39),
+        delete: [35; 39),
+        insert: "main",
         kind: Function,
         detail: "fn main()"
     }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap
index 2ba9c82b0..39fff2cb7 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.843178841Z"
+created: "2019-02-18T09:22:24.268227065Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "new",
         source_range: [67; 69),
+        delete: [67; 69),
+        insert: "new",
         kind: Method,
         detail: "fn new() -> Foo"
     }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
index c071ff198..ef77816ec 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.808400485Z"
+created: "2019-02-18T09:22:24.213677341Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "foo",
         source_range: [40; 41),
+        delete: [40; 41),
+        insert: "foo",
         kind: Function,
         detail: "pub fn foo()"
     }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
index 68bfbcdcd..87691b304 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.810202671Z"
+created: "2019-02-18T09:22:24.188564584Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,14 +8,16 @@ expression: kind_completions
     CompletionItem {
         label: "bar",
         source_range: [129; 129),
+        delete: [129; 129),
+        insert: "bar",
         kind: Binding
     },
     CompletionItem {
         label: "foo",
         source_range: [129; 129),
+        delete: [129; 129),
+        insert: "foo()$0",
         kind: Function,
-        detail: "fn foo() ->",
-        insert_text: "foo()$0",
-        insert_text_format: Snippet
+        detail: "fn foo() ->"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant.snap
index b4a8443a0..1df121523 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.672144115Z"
+created: "2019-02-18T09:22:24.045355450Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "Bar",
         source_range: [116; 116),
+        delete: [116; 116),
+        insert: "Bar",
         kind: EnumVariant,
         detail: "(i32)",
         documentation: Documentation(
@@ -17,6 +19,8 @@ expression: kind_completions
     CompletionItem {
         label: "Foo",
         source_range: [116; 116),
+        delete: [116; 116),
+        insert: "Foo",
         kind: EnumVariant,
         detail: "()",
         documentation: Documentation(
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant_with_details.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant_with_details.snap
index 8f6defc4f..70ea96e1b 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant_with_details.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__enum_variant_with_details.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.686329490Z"
+created: "2019-02-18T09:22:24.062138085Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "Bar",
         source_range: [180; 180),
+        delete: [180; 180),
+        insert: "Bar",
         kind: EnumVariant,
         detail: "(i32, u32)",
         documentation: Documentation(
@@ -17,6 +19,8 @@ expression: kind_completions
     CompletionItem {
         label: "Foo",
         source_range: [180; 180),
+        delete: [180; 180),
+        insert: "Foo",
         kind: EnumVariant,
         detail: "()",
         documentation: Documentation(
@@ -26,6 +30,8 @@ expression: kind_completions
     CompletionItem {
         label: "S",
         source_range: [180; 180),
+        delete: [180; 180),
+        insert: "S",
         kind: EnumVariant,
         detail: "(S)"
     }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap
index 2a2959fd2..0d36fd603 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.763042807Z"
+created: "2019-02-18T09:22:24.137183638Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "other_crate",
         source_range: [4; 4),
+        delete: [4; 4),
+        insert: "other_crate",
         kind: Module
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap
index 5e1a876da..210e5a02d 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.765665697Z"
+created: "2019-02-18T09:22:24.143253235Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,14 +8,16 @@ expression: kind_completions
     CompletionItem {
         label: "T",
         source_range: [44; 44),
+        delete: [44; 44),
+        insert: "T",
         kind: TypeParam
     },
     CompletionItem {
         label: "quux",
         source_range: [44; 44),
+        delete: [44; 44),
+        insert: "quux()$0",
         kind: Function,
-        detail: "fn quux<T>()",
-        insert_text: "quux()$0",
-        insert_text_format: Snippet
+        detail: "fn quux<T>()"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap
index b0c9bff03..ab8c30446 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.768275744Z"
+created: "2019-02-18T09:22:24.149424158Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,11 +8,15 @@ expression: kind_completions
     CompletionItem {
         label: "T",
         source_range: [46; 46),
+        delete: [46; 46),
+        insert: "T",
         kind: TypeParam
     },
     CompletionItem {
         label: "X",
         source_range: [46; 46),
+        delete: [46; 46),
+        insert: "X",
         kind: Struct
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
index 8ef0a4b7a..a4fc447b2 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.808403924Z"
+created: "2019-02-18T09:22:24.224510370Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,17 +8,17 @@ expression: kind_completions
     CompletionItem {
         label: "main",
         source_range: [53; 56),
+        delete: [53; 56),
+        insert: "main()$0",
         kind: Function,
-        detail: "fn main()",
-        insert_text: "main()$0",
-        insert_text_format: Snippet
+        detail: "fn main()"
     },
     CompletionItem {
         label: "no_args",
         source_range: [53; 56),
+        delete: [53; 56),
+        insert: "no_args()$0",
         kind: Function,
-        detail: "fn no_args()",
-        insert_text: "no_args()$0",
-        insert_text_format: Snippet
+        detail: "fn no_args()"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
index 32730639e..b124355d5 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.843178843Z"
+created: "2019-02-18T09:22:24.267013140Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,17 +8,17 @@ expression: kind_completions
     CompletionItem {
         label: "main",
         source_range: [72; 77),
+        delete: [72; 77),
+        insert: "main()$0",
         kind: Function,
-        detail: "fn main()",
-        insert_text: "main()$0",
-        insert_text_format: Snippet
+        detail: "fn main()"
     },
     CompletionItem {
         label: "with_args",
         source_range: [72; 77),
+        delete: [72; 77),
+        insert: "with_args($0)",
         kind: Function,
-        detail: "fn with_args(x: i32, y: String)",
-        insert_text: "with_args($0)",
-        insert_text_format: Snippet
+        detail: "fn with_args(x: i32, y: String)"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap
index 99f21b258..fec729d48 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.877573951Z"
+created: "2019-02-18T09:22:24.303360770Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,9 +8,9 @@ expression: kind_completions
     CompletionItem {
         label: "foo",
         source_range: [139; 140),
+        delete: [139; 140),
+        insert: "foo()$0",
         kind: Method,
-        detail: "fn foo(&self)",
-        insert_text: "foo()$0",
-        insert_text_format: Snippet
+        detail: "fn foo(&self)"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap
index 022e3f6e9..045e2a4e6 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function1.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.639066512Z"
+created: "2019-02-18T09:22:23.987788720Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,36 +8,36 @@ expression: kind_completions
     CompletionItem {
         label: "if",
         source_range: [41; 41),
-        kind: Keyword,
-        insert_text: "if $0 {}",
-        insert_text_format: Snippet
+        delete: [41; 41),
+        insert: "if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "loop",
         source_range: [41; 41),
-        kind: Keyword,
-        insert_text: "loop {$0}",
-        insert_text_format: Snippet
+        delete: [41; 41),
+        insert: "loop {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "match",
         source_range: [41; 41),
-        kind: Keyword,
-        insert_text: "match $0 {}",
-        insert_text_format: Snippet
+        delete: [41; 41),
+        insert: "match $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "return",
         source_range: [41; 41),
-        kind: Keyword,
-        insert_text: "return;",
-        insert_text_format: Snippet
+        delete: [41; 41),
+        insert: "return;",
+        kind: Keyword
     },
     CompletionItem {
         label: "while",
         source_range: [41; 41),
-        kind: Keyword,
-        insert_text: "while $0 {}",
-        insert_text_format: Snippet
+        delete: [41; 41),
+        insert: "while $0 {}",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap
index fd63c1678..b08efa522 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function2.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.630760038Z"
+created: "2019-02-18T09:22:23.984740354Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,50 +8,50 @@ expression: kind_completions
     CompletionItem {
         label: "else",
         source_range: [92; 92),
-        kind: Keyword,
-        insert_text: "else {$0}",
-        insert_text_format: Snippet
+        delete: [92; 92),
+        insert: "else {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "else if",
         source_range: [92; 92),
-        kind: Keyword,
-        insert_text: "else if $0 {}",
-        insert_text_format: Snippet
+        delete: [92; 92),
+        insert: "else if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "if",
         source_range: [92; 92),
-        kind: Keyword,
-        insert_text: "if $0 {}",
-        insert_text_format: Snippet
+        delete: [92; 92),
+        insert: "if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "loop",
         source_range: [92; 92),
-        kind: Keyword,
-        insert_text: "loop {$0}",
-        insert_text_format: Snippet
+        delete: [92; 92),
+        insert: "loop {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "match",
         source_range: [92; 92),
-        kind: Keyword,
-        insert_text: "match $0 {}",
-        insert_text_format: Snippet
+        delete: [92; 92),
+        insert: "match $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "return",
         source_range: [92; 92),
-        kind: Keyword,
-        insert_text: "return;",
-        insert_text_format: Snippet
+        delete: [92; 92),
+        insert: "return;",
+        kind: Keyword
     },
     CompletionItem {
         label: "while",
         source_range: [92; 92),
-        kind: Keyword,
-        insert_text: "while $0 {}",
-        insert_text_format: Snippet
+        delete: [92; 92),
+        insert: "while $0 {}",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap
index 90f769078..e2b9214fb 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function3.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.659527166Z"
+created: "2019-02-18T09:22:24.049699338Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,36 +8,36 @@ expression: kind_completions
     CompletionItem {
         label: "if",
         source_range: [48; 48),
-        kind: Keyword,
-        insert_text: "if $0 {}",
-        insert_text_format: Snippet
+        delete: [48; 48),
+        insert: "if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "loop",
         source_range: [48; 48),
-        kind: Keyword,
-        insert_text: "loop {$0}",
-        insert_text_format: Snippet
+        delete: [48; 48),
+        insert: "loop {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "match",
         source_range: [48; 48),
-        kind: Keyword,
-        insert_text: "match $0 {}",
-        insert_text_format: Snippet
+        delete: [48; 48),
+        insert: "match $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "return",
         source_range: [48; 48),
-        kind: Keyword,
-        insert_text: "return $0;",
-        insert_text_format: Snippet
+        delete: [48; 48),
+        insert: "return $0;",
+        kind: Keyword
     },
     CompletionItem {
         label: "while",
         source_range: [48; 48),
-        kind: Keyword,
-        insert_text: "while $0 {}",
-        insert_text_format: Snippet
+        delete: [48; 48),
+        insert: "while $0 {}",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap
index 5e7ec108c..1ea7eb5ce 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_function4.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.696757543Z"
+created: "2019-02-18T09:22:24.090949782Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,36 +8,36 @@ expression: kind_completions
     CompletionItem {
         label: "if",
         source_range: [41; 41),
-        kind: Keyword,
-        insert_text: "if $0 {}",
-        insert_text_format: Snippet
+        delete: [41; 41),
+        insert: "if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "loop",
         source_range: [41; 41),
-        kind: Keyword,
-        insert_text: "loop {$0}",
-        insert_text_format: Snippet
+        delete: [41; 41),
+        insert: "loop {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "match",
         source_range: [41; 41),
-        kind: Keyword,
-        insert_text: "match $0 {}",
-        insert_text_format: Snippet
+        delete: [41; 41),
+        insert: "match $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "return",
         source_range: [41; 41),
-        kind: Keyword,
-        insert_text: "return;",
-        insert_text_format: Snippet
+        delete: [41; 41),
+        insert: "return;",
+        kind: Keyword
     },
     CompletionItem {
         label: "while",
         source_range: [41; 41),
-        kind: Keyword,
-        insert_text: "while $0 {}",
-        insert_text_format: Snippet
+        delete: [41; 41),
+        insert: "while $0 {}",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap
index f969a843b..76d5daf55 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt1.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.633925638Z"
+created: "2019-02-18T09:22:23.988755424Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,20 +8,22 @@ expression: kind_completions
     CompletionItem {
         label: "crate",
         source_range: [17; 17),
-        kind: Keyword,
-        insert_text: "crate::",
-        insert_text_format: PlainText
+        delete: [17; 17),
+        insert: "crate::",
+        kind: Keyword
     },
     CompletionItem {
         label: "self",
         source_range: [17; 17),
+        delete: [17; 17),
+        insert: "self",
         kind: Keyword
     },
     CompletionItem {
         label: "super",
         source_range: [17; 17),
-        kind: Keyword,
-        insert_text: "super::",
-        insert_text_format: PlainText
+        delete: [17; 17),
+        insert: "super::",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap
index bbbdeae8f..ee8bf4ca1 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt2.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.658885169Z"
+created: "2019-02-18T09:22:24.030382527Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,13 +8,15 @@ expression: kind_completions
     CompletionItem {
         label: "self",
         source_range: [20; 20),
+        delete: [20; 20),
+        insert: "self",
         kind: Keyword
     },
     CompletionItem {
         label: "super",
         source_range: [20; 20),
-        kind: Keyword,
-        insert_text: "super::",
-        insert_text_format: PlainText
+        delete: [20; 20),
+        insert: "super::",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap
index 84475e0d8..b44db276e 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__keywords_in_use_stmt3.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.688856977Z"
+created: "2019-02-18T09:22:24.073607133Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,13 +8,15 @@ expression: kind_completions
     CompletionItem {
         label: "self",
         source_range: [24; 24),
+        delete: [24; 24),
+        insert: "self",
         kind: Keyword
     },
     CompletionItem {
         label: "super",
         source_range: [24; 24),
-        kind: Keyword,
-        insert_text: "super::",
-        insert_text_format: PlainText
+        delete: [24; 24),
+        insert: "super::",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap
index 5d12dd41b..f220d35c2 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi1.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.638715790Z"
+created: "2019-02-18T09:22:23.989188654Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,36 +8,36 @@ expression: kind_completions
     CompletionItem {
         label: "if",
         source_range: [83; 83),
-        kind: Keyword,
-        insert_text: "if $0 {}",
-        insert_text_format: Snippet
+        delete: [83; 83),
+        insert: "if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "loop",
         source_range: [83; 83),
-        kind: Keyword,
-        insert_text: "loop {$0}",
-        insert_text_format: Snippet
+        delete: [83; 83),
+        insert: "loop {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "match",
         source_range: [83; 83),
-        kind: Keyword,
-        insert_text: "match $0 {}",
-        insert_text_format: Snippet
+        delete: [83; 83),
+        insert: "match $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "return",
         source_range: [83; 83),
-        kind: Keyword,
-        insert_text: "return $0;",
-        insert_text_format: Snippet
+        delete: [83; 83),
+        insert: "return $0;",
+        kind: Keyword
     },
     CompletionItem {
         label: "while",
         source_range: [83; 83),
-        kind: Keyword,
-        insert_text: "while $0 {}",
-        insert_text_format: Snippet
+        delete: [83; 83),
+        insert: "while $0 {}",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap
index 5866369b6..d2093acdf 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__last_return_in_block_has_semi2.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.661936290Z"
+created: "2019-02-18T09:22:24.036383875Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,36 +8,36 @@ expression: kind_completions
     CompletionItem {
         label: "if",
         source_range: [83; 83),
-        kind: Keyword,
-        insert_text: "if $0 {}",
-        insert_text_format: Snippet
+        delete: [83; 83),
+        insert: "if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "loop",
         source_range: [83; 83),
-        kind: Keyword,
-        insert_text: "loop {$0}",
-        insert_text_format: Snippet
+        delete: [83; 83),
+        insert: "loop {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "match",
         source_range: [83; 83),
-        kind: Keyword,
-        insert_text: "match $0 {}",
-        insert_text_format: Snippet
+        delete: [83; 83),
+        insert: "match $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "return",
         source_range: [83; 83),
-        kind: Keyword,
-        insert_text: "return $0;",
-        insert_text_format: Snippet
+        delete: [83; 83),
+        insert: "return $0;",
+        kind: Keyword
     },
     CompletionItem {
         label: "while",
         source_range: [83; 83),
-        kind: Keyword,
-        insert_text: "while $0 {}",
-        insert_text_format: Snippet
+        delete: [83; 83),
+        insert: "while $0 {}",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_attr_filtering.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__method_attr_filtering.snap
index 4753eece7..ce8af2159 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_attr_filtering.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__method_attr_filtering.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.598946710Z"
+created: "2019-02-18T09:22:23.941335305Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,9 +8,9 @@ expression: kind_completions
     CompletionItem {
         label: "the_method",
         source_range: [249; 249),
+        delete: [249; 249),
+        insert: "the_method()$0",
         kind: Method,
-        detail: "fn the_method(&self)",
-        insert_text: "the_method()$0",
-        insert_text_format: Snippet
+        detail: "fn the_method(&self)"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap
index 6cc8ab26c..41a10de14 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__method_completion.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.598948318Z"
+created: "2019-02-18T09:22:23.939676100Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,9 +8,9 @@ expression: kind_completions
     CompletionItem {
         label: "the_method",
         source_range: [144; 144),
+        delete: [144; 144),
+        insert: "the_method()$0",
         kind: Method,
-        detail: "fn the_method(&self)",
-        insert_text: "the_method()$0",
-        insert_text_format: Snippet
+        detail: "fn the_method(&self)"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__mod_with_docs.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__mod_with_docs.snap
index 47579bde1..1da3c3ba2 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__mod_with_docs.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__mod_with_docs.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.682030298Z"
+created: "2019-02-18T09:22:24.066918191Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "my",
         source_range: [23; 25),
+        delete: [23; 25),
+        insert: "my",
         kind: Module,
         documentation: Documentation(
             "Some simple\ndocs describing `mod my`."
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
index 28efac43f..86bc8679d 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.770568686Z"
+created: "2019-02-18T09:22:24.161888678Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,19 +8,23 @@ expression: kind_completions
     CompletionItem {
         label: "Baz",
         source_range: [89; 89),
+        delete: [89; 89),
+        insert: "Baz",
         kind: Enum
     },
     CompletionItem {
         label: "Foo",
         source_range: [89; 89),
+        delete: [89; 89),
+        insert: "Foo",
         kind: Struct
     },
     CompletionItem {
         label: "quux",
         source_range: [89; 89),
+        delete: [89; 89),
+        insert: "quux()$0",
         kind: Function,
-        detail: "fn quux()",
-        insert_text: "quux()$0",
-        insert_text_format: Snippet
+        detail: "fn quux()"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
index 01b6b968c..9f796b7ca 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.770992040Z"
+created: "2019-02-18T09:22:24.180517419Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,14 +8,16 @@ expression: kind_completions
     CompletionItem {
         label: "Bar",
         source_range: [101; 101),
+        delete: [101; 101),
+        insert: "Bar",
         kind: Struct
     },
     CompletionItem {
         label: "quux",
         source_range: [101; 101),
+        delete: [101; 101),
+        insert: "quux()$0",
         kind: Function,
-        detail: "fn quux()",
-        insert_text: "quux()$0",
-        insert_text_format: Snippet
+        detail: "fn quux()"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap
index e95763580..4920e500e 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__nested_use_tree.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.689653720Z"
+created: "2019-02-18T09:22:24.085605313Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,11 +8,15 @@ expression: kind_completions
     CompletionItem {
         label: "Spam",
         source_range: [12; 14),
+        delete: [12; 14),
+        insert: "Spam",
         kind: Struct
     },
     CompletionItem {
         label: "foo",
         source_range: [12; 14),
+        delete: [12; 14),
+        insert: "foo",
         kind: Module
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap
index 1295355a2..038e7f402 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__no_semi_after_break_continue_in_expr.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.641375216Z"
+created: "2019-02-18T09:22:23.999953358Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,44 +8,50 @@ expression: kind_completions
     CompletionItem {
         label: "break",
         source_range: [106; 108),
+        delete: [106; 108),
+        insert: "break",
         kind: Keyword
     },
     CompletionItem {
         label: "continue",
         source_range: [106; 108),
+        delete: [106; 108),
+        insert: "continue",
         kind: Keyword
     },
     CompletionItem {
         label: "if",
         source_range: [106; 108),
-        kind: Keyword,
-        insert_text: "if $0 {}",
-        insert_text_format: Snippet
+        delete: [106; 108),
+        insert: "if $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "loop",
         source_range: [106; 108),
-        kind: Keyword,
-        insert_text: "loop {$0}",
-        insert_text_format: Snippet
+        delete: [106; 108),
+        insert: "loop {$0}",
+        kind: Keyword
     },
     CompletionItem {
         label: "match",
         source_range: [106; 108),
-        kind: Keyword,
-        insert_text: "match $0 {}",
-        insert_text_format: Snippet
+        delete: [106; 108),
+        insert: "match $0 {}",
+        kind: Keyword
     },
     CompletionItem {
         label: "return",
         source_range: [106; 108),
+        delete: [106; 108),
+        insert: "return",
         kind: Keyword
     },
     CompletionItem {
         label: "while",
         source_range: [106; 108),
-        kind: Keyword,
-        insert_text: "while $0 {}",
-        insert_text_format: Snippet
+        delete: [106; 108),
+        insert: "while $0 {}",
+        kind: Keyword
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap
index dba925f7c..cab77f5a2 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_last_param.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.606265507Z"
+created: "2019-02-18T09:22:23.949634602Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "file_id: FileId",
         source_range: [98; 102),
+        delete: [98; 102),
+        insert: "file_id: FileId",
         lookup: "file_id"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap
index c5873becb..8fbee160c 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_nth_param.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.606265538Z"
+created: "2019-02-18T09:22:23.949634355Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "file_id: FileId",
         source_range: [98; 102),
+        delete: [98; 102),
+        insert: "file_id: FileId",
         lookup: "file_id"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap
index 5231db54c..76eeadb6d 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__param_completion_trait_param.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.628419014Z"
+created: "2019-02-18T09:22:23.974417169Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "file_id: FileId",
         source_range: [269; 273),
+        delete: [269; 273),
+        insert: "file_id: FileId",
         lookup: "file_id"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__postfix_completion_works_for_trivial_path_expression.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__postfix_completion_works_for_trivial_path_expression.snap
index bd22d546a..2b5435f0c 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__postfix_completion_works_for_trivial_path_expression.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__postfix_completion_works_for_trivial_path_expression.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.734401559Z"
+created: "2019-02-18T09:22:24.127119709Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,106 +8,50 @@ expression: kind_completions
     CompletionItem {
         label: "dbg",
         source_range: [76; 76),
-        detail: "dbg!(expr)",
-        insert_text: "dbg!(bar)",
-        insert_text_format: Snippet,
-        text_edit: TextEdit {
-            atoms: [
-                AtomTextEdit {
-                    delete: [72; 76),
-                    insert: ""
-                }
-            ]
-        }
+        delete: [72; 76),
+        insert: "dbg!(bar)",
+        detail: "dbg!(expr)"
     },
     CompletionItem {
         label: "if",
         source_range: [76; 76),
-        detail: "if expr {}",
-        insert_text: "if bar {$0}",
-        insert_text_format: Snippet,
-        text_edit: TextEdit {
-            atoms: [
-                AtomTextEdit {
-                    delete: [72; 76),
-                    insert: ""
-                }
-            ]
-        }
+        delete: [72; 76),
+        insert: "if bar {$0}",
+        detail: "if expr {}"
     },
     CompletionItem {
         label: "match",
         source_range: [76; 76),
-        detail: "match expr {}",
-        insert_text: "match bar {\n${1:_} => {$0\\},\n}",
-        insert_text_format: Snippet,
-        text_edit: TextEdit {
-            atoms: [
-                AtomTextEdit {
-                    delete: [72; 76),
-                    insert: ""
-                }
-            ]
-        }
+        delete: [72; 76),
+        insert: "match bar {\n${1:_} => {$0\\},\n}",
+        detail: "match expr {}"
     },
     CompletionItem {
         label: "not",
         source_range: [76; 76),
-        detail: "!expr",
-        insert_text: "!bar",
-        insert_text_format: Snippet,
-        text_edit: TextEdit {
-            atoms: [
-                AtomTextEdit {
-                    delete: [72; 76),
-                    insert: ""
-                }
-            ]
-        }
+        delete: [72; 76),
+        insert: "!bar",
+        detail: "!expr"
     },
     CompletionItem {
         label: "ref",
         source_range: [76; 76),
-        detail: "&expr",
-        insert_text: "&bar",
-        insert_text_format: Snippet,
-        text_edit: TextEdit {
-            atoms: [
-                AtomTextEdit {
-                    delete: [72; 76),
-                    insert: ""
-                }
-            ]
-        }
+        delete: [72; 76),
+        insert: "&bar",
+        detail: "&expr"
     },
     CompletionItem {
         label: "refm",
         source_range: [76; 76),
-        detail: "&mut expr",
-        insert_text: "&mut bar",
-        insert_text_format: Snippet,
-        text_edit: TextEdit {
-            atoms: [
-                AtomTextEdit {
-                    delete: [72; 76),
-                    insert: ""
-                }
-            ]
-        }
+        delete: [72; 76),
+        insert: "&mut bar",
+        detail: "&mut expr"
     },
     CompletionItem {
         label: "while",
         source_range: [76; 76),
-        detail: "while expr {}",
-        insert_text: "while bar {\n$0\n}",
-        insert_text_format: Snippet,
-        text_edit: TextEdit {
-            atoms: [
-                AtomTextEdit {
-                    delete: [72; 76),
-                    insert: ""
-                }
-            ]
-        }
+        delete: [72; 76),
+        insert: "while bar {\n$0\n}",
+        detail: "while expr {}"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
index 25c5007e4..0738cf466 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.780512486Z"
+created: "2019-02-18T09:22:24.182964414Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,14 +8,16 @@ expression: kind_completions
     CompletionItem {
         label: "Foo",
         source_range: [47; 47),
+        delete: [47; 47),
+        insert: "Foo",
         kind: Struct
     },
     CompletionItem {
         label: "x",
         source_range: [47; 47),
+        delete: [47; 47),
+        insert: "x()$0",
         kind: Function,
-        detail: "fn x() ->",
-        insert_text: "x()$0",
-        insert_text_format: Snippet
+        detail: "fn x() ->"
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
index d390be2dc..baf12cae1 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.774705610Z"
+created: "2019-02-18T09:22:24.174038680Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,11 +8,15 @@ expression: kind_completions
     CompletionItem {
         label: "Self",
         source_range: [25; 25),
+        delete: [25; 25),
+        insert: "Self",
         kind: TypeParam
     },
     CompletionItem {
         label: "self",
         source_range: [25; 25),
+        delete: [25; 25),
+        insert: "self",
         kind: Binding
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
index 6ad919849..fce2d6479 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.799497268Z"
+created: "2019-02-18T09:22:24.191576723Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,15 +8,15 @@ expression: kind_completions
     CompletionItem {
         label: "pd",
         source_range: [17; 17),
-        kind: Snippet,
-        insert_text: "eprintln!(\"$0 = {:?}\", $0);",
-        insert_text_format: Snippet
+        delete: [17; 17),
+        insert: "eprintln!(\"$0 = {:?}\", $0);",
+        kind: Snippet
     },
     CompletionItem {
         label: "ppd",
         source_range: [17; 17),
-        kind: Snippet,
-        insert_text: "eprintln!(\"$0 = {:#?}\", $0);",
-        insert_text_format: Snippet
+        delete: [17; 17),
+        insert: "eprintln!(\"$0 = {:#?}\", $0);",
+        kind: Snippet
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
index 43367010b..d2b1a5f0e 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.800831987Z"
+created: "2019-02-18T09:22:24.187670733Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,16 +8,16 @@ expression: kind_completions
     CompletionItem {
         label: "Test function",
         source_range: [66; 66),
+        delete: [66; 66),
+        insert: "#[test]\nfn ${1:feature}() {\n    $0\n}",
         kind: Snippet,
-        lookup: "tfn",
-        insert_text: "#[test]\nfn ${1:feature}() {\n    $0\n}",
-        insert_text_format: Snippet
+        lookup: "tfn"
     },
     CompletionItem {
         label: "pub(crate)",
         source_range: [66; 66),
-        kind: Snippet,
-        insert_text: "pub(crate) $0",
-        insert_text_format: Snippet
+        delete: [66; 66),
+        insert: "pub(crate) $0",
+        kind: Snippet
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_const.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_const.snap
index c78b06d3c..6ad4c5acc 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_const.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_const.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.704544613Z"
+created: "2019-02-18T09:22:24.093406123Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "C",
         source_range: [107; 107),
+        delete: [107; 107),
+        insert: "C",
         kind: Const,
         detail: "const C: i32 = 42;",
         documentation: Documentation(
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_method.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_method.snap
index 67638b4d1..163b325c3 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_method.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_method.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.704544615Z"
+created: "2019-02-18T09:22:24.093082839Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,12 +8,12 @@ expression: kind_completions
     CompletionItem {
         label: "m",
         source_range: [100; 100),
+        delete: [100; 100),
+        insert: "m()$0",
         kind: Method,
         detail: "fn m()",
         documentation: Documentation(
             "An associated method"
-        ),
-        insert_text: "m()$0",
-        insert_text_format: Snippet
+        )
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_type.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_type.snap
index c5f5b9f10..583bda225 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_type.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_associated_type.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.725668999Z"
+created: "2019-02-18T09:22:24.090876030Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "T",
         source_range: [101; 101),
+        delete: [101; 101),
+        insert: "T",
         kind: TypeAlias,
         detail: "type T = i32;",
         documentation: Documentation(
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap
index ffad98f7d..58271b873 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.599230647Z"
+created: "2019-02-18T09:22:23.939645902Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "the_field",
         source_range: [85; 85),
+        delete: [85; 85),
+        insert: "the_field",
         kind: Field,
         detail: "u32"
     }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap
index 99aef933a..b38867b81 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_autoderef.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.598966298Z"
+created: "2019-02-18T09:22:23.940872916Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,14 +8,16 @@ expression: kind_completions
     CompletionItem {
         label: "foo",
         source_range: [126; 126),
+        delete: [126; 126),
+        insert: "foo()$0",
         kind: Method,
-        detail: "fn foo(&self)",
-        insert_text: "foo()$0",
-        insert_text_format: Snippet
+        detail: "fn foo(&self)"
     },
     CompletionItem {
         label: "the_field",
         source_range: [126; 126),
+        delete: [126; 126),
+        insert: "the_field",
         kind: Field,
         detail: "(u32, i32)"
     }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap
index 52991b9fb..8e5cab43e 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__struct_field_completion_self.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.598965593Z"
+created: "2019-02-18T09:22:23.940872918Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,14 +8,16 @@ expression: kind_completions
     CompletionItem {
         label: "foo",
         source_range: [187; 187),
+        delete: [187; 187),
+        insert: "foo()$0",
         kind: Method,
-        detail: "fn foo(self)",
-        insert_text: "foo()$0",
-        insert_text_format: Snippet
+        detail: "fn foo(self)"
     },
     CompletionItem {
         label: "the_field",
         source_range: [187; 187),
+        delete: [187; 187),
+        insert: "the_field",
         kind: Field,
         detail: "(u32,)",
         documentation: Documentation(
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__tuple_field_completion.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__tuple_field_completion.snap
index 5b6ed9d77..3f2780621 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__tuple_field_completion.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__tuple_field_completion.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.598973382Z"
+created: "2019-02-18T09:22:23.939710971Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,12 +8,16 @@ expression: kind_completions
     CompletionItem {
         label: "0",
         source_range: [75; 75),
+        delete: [75; 75),
+        insert: "0",
         kind: Field,
         detail: "i32"
     },
     CompletionItem {
         label: "1",
         source_range: [75; 75),
+        delete: [75; 75),
+        insert: "1",
         kind: Field,
         detail: "f64"
     }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap
index 3c670ad5b..34e70c35d 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_crate.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.726365989Z"
+created: "2019-02-18T09:22:24.098574884Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,11 +8,15 @@ expression: kind_completions
     CompletionItem {
         label: "Spam",
         source_range: [11; 13),
+        delete: [11; 13),
+        insert: "Spam",
         kind: Struct
     },
     CompletionItem {
         label: "foo",
         source_range: [11; 13),
+        delete: [11; 13),
+        insert: "foo",
         kind: Module
     }
 ]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap
index bf314de84..d15f1905b 100644
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap
+++ b/crates/ra_ide_api/src/completion/snapshots/completion_item__use_item_starting_with_self.snap
@@ -1,5 +1,5 @@
 ---
-created: "2019-02-18T07:29:59.731789946Z"
+created: "2019-02-18T09:22:24.102063333Z"
 creator: [email protected]
 source: crates/ra_ide_api/src/completion/completion_item.rs
 expression: kind_completions
@@ -8,6 +8,8 @@ expression: kind_completions
     CompletionItem {
         label: "Bar",
         source_range: [26; 26),
+        delete: [26; 26),
+        insert: "Bar",
         kind: Struct
     }
 ]
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index c3192a1e5..f0f67b663 100644
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -79,11 +79,31 @@ impl ConvWith for CompletionItem {
     type Ctx = LineIndex;
     type Output = ::lsp_types::CompletionItem;
 
-    fn conv_with(mut self, ctx: &LineIndex) -> ::lsp_types::CompletionItem {
-        let atom_text_edit = AtomTextEdit::replace(self.source_range(), self.insert_text());
-        let text_edit = (&atom_text_edit).conv_with(ctx);
-        let additional_text_edits =
-            if let Some(edit) = self.take_text_edit() { Some(edit.conv_with(ctx)) } else { None };
+    fn conv_with(self, ctx: &LineIndex) -> ::lsp_types::CompletionItem {
+        let mut additional_text_edits = Vec::new();
+        let mut text_edit = None;
+        // LSP does not allow arbitrary edits in completion, so we have to do a
+        // non-trivial mapping here.
+        for atom_edit in self.text_edit().as_atoms() {
+            if self.source_range().is_subrange(&atom_edit.delete) {
+                text_edit = Some(if atom_edit.delete == self.source_range() {
+                    atom_edit.conv_with(ctx)
+                } else {
+                    assert!(self.source_range().end() == atom_edit.delete.end());
+                    let range1 =
+                        TextRange::from_to(atom_edit.delete.start(), self.source_range().start());
+                    let range2 = self.source_range();
+                    let edit1 = AtomTextEdit::replace(range1, String::new());
+                    let edit2 = AtomTextEdit::replace(range2, atom_edit.insert.clone());
+                    additional_text_edits.push(edit1.conv_with(ctx));
+                    edit2.conv_with(ctx)
+                })
+            } else {
+                assert!(self.source_range().intersection(&atom_edit.delete).is_none());
+                additional_text_edits.push(atom_edit.conv_with(ctx));
+            }
+        }
+        let text_edit = text_edit.unwrap();
 
         let mut res = lsp_types::CompletionItem {
             label: self.label().to_string(),
@@ -91,7 +111,7 @@ impl ConvWith for CompletionItem {
             filter_text: Some(self.lookup().to_string()),
             kind: self.kind().map(|it| it.conv()),
             text_edit: Some(text_edit),
-            additional_text_edits,
+            additional_text_edits: Some(additional_text_edits),
             documentation: self.documentation().map(|it| it.conv()),
             ..Default::default()
         };