1 files changed, 6 insertions, 21 deletions

diff --git a/crates/ra_assists/src/assist_context.rs b/crates/ra_assists/src/assist_context.rs
index 005c17776..5b1a4680b 100644
--- a/crates/ra_assists/src/assist_context.rs
+++ b/crates/ra_assists/src/assist_context.rs
@@ -5,7 +5,7 @@ use hir::Semantics;
 use ra_db::{FileId, FileRange};
 use ra_fmt::{leading_indent, reindent};
 use ra_ide_db::{
-    source_change::{SingleFileChange, SourceChange},
+    source_change::{SourceChange, SourceFileEdit},
     RootDatabase,
 };
 use ra_syntax::{
@@ -150,11 +150,10 @@ impl Assists {
         self.add_impl(label, f)
     }
     fn add_impl(&mut self, label: Assist, f: impl FnOnce(&mut AssistBuilder)) -> Option<()> {
-        let change_label = label.label.clone();
         let source_change = if self.resolve {
             let mut builder = AssistBuilder::new(self.file);
             f(&mut builder);
-            Some(builder.finish(change_label))
+            Some(builder.finish())
         } else {
             None
         };
@@ -171,19 +170,13 @@ impl Assists {
 
 pub(crate) struct AssistBuilder {
     edit: TextEditBuilder,
-    cursor_position: Option<TextSize>,
     file: FileId,
     is_snippet: bool,
 }
 
 impl AssistBuilder {
     pub(crate) fn new(file: FileId) -> AssistBuilder {
-        AssistBuilder {
-            edit: TextEditBuilder::default(),
-            cursor_position: None,
-            file,
-            is_snippet: false,
-        }
+        AssistBuilder { edit: TextEditBuilder::default(), file, is_snippet: false }
     }
 
     /// Remove specified `range` of text.
@@ -241,10 +234,6 @@ impl AssistBuilder {
         algo::diff(&node, &new).into_text_edit(&mut self.edit)
     }
 
-    /// Specify desired position of the cursor after the assist is applied.
-    pub(crate) fn set_cursor(&mut self, offset: TextSize) {
-        self.cursor_position = Some(offset)
-    }
     // FIXME: better API
     pub(crate) fn set_file(&mut self, assist_file: FileId) {
         self.file = assist_file;
@@ -256,14 +245,10 @@ impl AssistBuilder {
         &mut self.edit
     }
 
-    fn finish(self, change_label: String) -> SourceChange {
+    fn finish(self) -> SourceChange {
         let edit = self.edit.finish();
-        if edit.is_empty() && self.cursor_position.is_none() {
-            panic!("Only call `add_assist` if the assist can be applied")
-        }
-        let mut res =
-            SingleFileChange { label: change_label, edit, cursor_position: self.cursor_position }
-                .into_source_change(self.file);
+        let source_file_edit = SourceFileEdit { file_id: self.file, edit };
+        let mut res: SourceChange = source_file_edit.into();
         if self.is_snippet {
             res.is_snippet = true;
         }