From 0840ec038b2822a424acf238d8db5af569f99a21 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 28 Sep 2019 20:09:57 +0300
Subject: migrate add impl items to the new editing API

---
 crates/ra_assists/src/assist_ctx.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'crates/ra_assists/src/assist_ctx.rs')

diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs
index c45262efa..cbe12e908 100644
--- a/crates/ra_assists/src/assist_ctx.rs
+++ b/crates/ra_assists/src/assist_ctx.rs
@@ -2,7 +2,7 @@ use hir::db::HirDatabase;
 use ra_db::FileRange;
 use ra_fmt::{leading_indent, reindent};
 use ra_syntax::{
-    algo::{find_covering_element, find_node_at_offset},
+    algo::{self, find_covering_element, find_node_at_offset},
     AstNode, SourceFile, SyntaxElement, SyntaxNode, SyntaxToken, TextRange, TextUnit,
     TokenAtOffset,
 };
@@ -177,6 +177,12 @@ impl AssistBuilder {
         &mut self.edit
     }
 
+    pub(crate) fn replace_ast<N: AstNode>(&mut self, old: N, new: N) {
+        for (from, to) in algo::diff(old.syntax(), new.syntax()) {
+            self.edit.replace(from.text_range(), to.to_string())
+        }
+    }
+
     fn build(self) -> AssistAction {
         AssistAction {
             edit: self.edit.finish(),
-- 
cgit v1.2.3


From e010b144d5abcbd0947d0490123ef693a6a17c78 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 30 Sep 2019 09:27:26 +0300
Subject: move field list to ast/edit.rs

---
 crates/ra_assists/src/assist_ctx.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'crates/ra_assists/src/assist_ctx.rs')

diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs
index cbe12e908..5f564be0b 100644
--- a/crates/ra_assists/src/assist_ctx.rs
+++ b/crates/ra_assists/src/assist_ctx.rs
@@ -178,9 +178,7 @@ impl AssistBuilder {
     }
 
     pub(crate) fn replace_ast<N: AstNode>(&mut self, old: N, new: N) {
-        for (from, to) in algo::diff(old.syntax(), new.syntax()) {
-            self.edit.replace(from.text_range(), to.to_string())
-        }
+        algo::diff(old.syntax(), new.syntax()).into_text_edit(&mut self.edit)
     }
 
     fn build(self) -> AssistAction {
-- 
cgit v1.2.3