Merge #416

416: assist-builder r=matklad a=matklad



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

2 files changed, 4 insertions, 14 deletions

diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index 136e7f7dc..771dad475 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -333,19 +333,9 @@ impl db::RootDatabase {
 
     pub(crate) fn assists(&self, frange: FileRange) -> Vec<SourceChange> {
         let file = self.source_file(frange.file_id);
-        let offset = frange.range.start();
-        let actions = vec![
-            assists::flip_comma(&file, offset).map(|f| f()),
-            assists::add_derive(&file, offset).map(|f| f()),
-            assists::add_impl(&file, offset).map(|f| f()),
-            assists::change_visibility(&file, offset).map(|f| f()),
-            assists::introduce_variable(&file, frange.range).map(|f| f()),
-        ];
-        actions
+        assists::assists(&file, frange.range)
             .into_iter()
-            .filter_map(|local_edit| {
-                Some(SourceChange::from_local_edit(frange.file_id, local_edit?))
-            })
+            .map(|local_edit| SourceChange::from_local_edit(frange.file_id, local_edit))
             .collect()
     }
 
@@ -440,7 +430,7 @@ impl db::RootDatabase {
             .map(|(file_id, text_range)| SourceFileEdit {
                 file_id: *file_id,
                 edit: {
-                    let mut builder = ra_text_edit::TextEditBuilder::new();
+                    let mut builder = ra_text_edit::TextEditBuilder::default();
                     builder.replace(*text_range, new_name.into());
                     builder.finish()
                 },
diff --git a/crates/ra_analysis/tests/tests.rs b/crates/ra_analysis/tests/tests.rs
index bcf29d29c..c2ef87b54 100644
--- a/crates/ra_analysis/tests/tests.rs
+++ b/crates/ra_analysis/tests/tests.rs
@@ -531,7 +531,7 @@ fn test_rename_for_mut_param() {
 fn test_rename(text: &str, new_name: &str, expected: &str) {
     let (analysis, position) = single_file_with_position(text);
     let edits = analysis.rename(position, new_name).unwrap();
-    let mut text_edit_bulder = ra_text_edit::TextEditBuilder::new();
+    let mut text_edit_bulder = ra_text_edit::TextEditBuilder::default();
     let mut file_id: Option<FileId> = None;
     for edit in edits {
         file_id = Some(edit.file_id);