1 files changed, 12 insertions, 24 deletions

diff --git a/crates/ra_editor/src/assists/add_impl.rs b/crates/ra_editor/src/assists/add_impl.rs
index 50e00688e..9353e2717 100644
--- a/crates/ra_editor/src/assists/add_impl.rs
+++ b/crates/ra_editor/src/assists/add_impl.rs
@@ -1,23 +1,16 @@
 use join_to_string::join;
-use ra_text_edit::TextEditBuilder;
 use ra_syntax::{
     ast::{self, AstNode, NameOwner, TypeParamsOwner},
-    SourceFileNode,
     TextUnit,
 };
 
-use crate::{find_node_at_offset, assists::LocalEdit};
+use crate::assists::{AssistCtx, Assist};
 
-pub fn add_impl<'a>(
-    file: &'a SourceFileNode,
-    offset: TextUnit,
-) -> Option<impl FnOnce() -> LocalEdit + 'a> {
-    let nominal = find_node_at_offset::<ast::NominalDef>(file.syntax(), offset)?;
+pub fn add_impl(ctx: AssistCtx) -> Option<Assist> {
+    let nominal = ctx.node_at_offset::<ast::NominalDef>()?;
     let name = nominal.name()?;
-
-    Some(move || {
+    ctx.build("add impl", |edit| {
         let type_params = nominal.type_param_list();
-        let mut edit = TextEditBuilder::new();
         let start_offset = nominal.syntax().range().end();
         let mut buf = String::new();
         buf.push_str("\n\nimpl");
@@ -40,38 +33,33 @@ pub fn add_impl<'a>(
                 .to_buf(&mut buf);
         }
         buf.push_str(" {\n");
-        let offset = start_offset + TextUnit::of_str(&buf);
+        edit.set_cursor(start_offset + TextUnit::of_str(&buf));
         buf.push_str("\n}");
         edit.insert(start_offset, buf);
-        LocalEdit {
-            label: "add impl".to_string(),
-            edit: edit.finish(),
-            cursor_position: Some(offset),
-        }
     })
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_utils::check_action;
+    use crate::assists::check_assist;
 
     #[test]
     fn test_add_impl() {
-        check_action(
+        check_assist(
+            add_impl,
             "struct Foo {<|>}\n",
             "struct Foo {}\n\nimpl Foo {\n<|>\n}\n",
-            |file, off| add_impl(file, off).map(|f| f()),
         );
-        check_action(
+        check_assist(
+            add_impl,
             "struct Foo<T: Clone> {<|>}",
             "struct Foo<T: Clone> {}\n\nimpl<T: Clone> Foo<T> {\n<|>\n}",
-            |file, off| add_impl(file, off).map(|f| f()),
         );
-        check_action(
+        check_assist(
+            add_impl,
             "struct Foo<'a, T: Foo<'a>> {<|>}",
             "struct Foo<'a, T: Foo<'a>> {}\n\nimpl<'a, T: Foo<'a>> Foo<'a, T> {\n<|>\n}",
-            |file, off| add_impl(file, off).map(|f| f()),
         );
     }