3 files changed, 15 insertions, 12 deletions

diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index 5ee218b6b..133decc52 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -28,6 +28,7 @@ rustc-hash = "1.0"
 
 ra_syntax = { path = "../ra_syntax" }
 ra_editor = { path = "../ra_editor" }
+ra_text_edit = { path = "../ra_text_edit" }
 ra_analysis = { path = "../ra_analysis" }
 gen_lsp_server = { path = "../gen_lsp_server" }
 
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index 28368787c..7467f472c 100644
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -1,9 +1,10 @@
 use languageserver_types::{
-    Location, Position, Range, SymbolKind, TextDocumentEdit, TextDocumentIdentifier,
-    TextDocumentItem, TextDocumentPositionParams, TextEdit, Url, VersionedTextDocumentIdentifier,
+    self, Location, Position, Range, SymbolKind, TextDocumentEdit, TextDocumentIdentifier,
+    TextDocumentItem, TextDocumentPositionParams, Url, VersionedTextDocumentIdentifier,
 };
 use ra_analysis::{FileId, FileSystemEdit, SourceChange, SourceFileNodeEdit, FilePosition};
-use ra_editor::{AtomEdit, Edit, LineCol, LineIndex};
+use ra_editor::{LineCol, LineIndex};
+use ra_text_edit::{AtomTextEdit, TextEdit};
 use ra_syntax::{SyntaxKind, TextRange, TextUnit};
 
 use crate::{req, server_world::ServerWorld, Result};
@@ -91,11 +92,11 @@ impl ConvWith for Range {
     }
 }
 
-impl ConvWith for Edit {
+impl ConvWith for TextEdit {
     type Ctx = LineIndex;
-    type Output = Vec<TextEdit>;
+    type Output = Vec<languageserver_types::TextEdit>;
 
-    fn conv_with(self, line_index: &LineIndex) -> Vec<TextEdit> {
+    fn conv_with(self, line_index: &LineIndex) -> Vec<languageserver_types::TextEdit> {
         self.into_atoms()
             .into_iter()
             .map_conv_with(line_index)
@@ -103,12 +104,12 @@ impl ConvWith for Edit {
     }
 }
 
-impl ConvWith for AtomEdit {
+impl ConvWith for AtomTextEdit {
     type Ctx = LineIndex;
-    type Output = TextEdit;
+    type Output = languageserver_types::TextEdit;
 
-    fn conv_with(self, line_index: &LineIndex) -> TextEdit {
-        TextEdit {
+    fn conv_with(self, line_index: &LineIndex) -> languageserver_types::TextEdit {
+        languageserver_types::TextEdit {
             range: self.delete.conv_with(line_index),
             new_text: self.insert,
         }
@@ -228,7 +229,7 @@ impl TryConvWith for SourceChange {
 fn translate_offset_with_edit(
     pre_edit_index: &LineIndex,
     offset: TextUnit,
-    edits: &[AtomEdit],
+    edits: &[AtomTextEdit],
 ) -> LineCol {
     let fallback = pre_edit_index.line_col(offset);
     let edit = match edits.first() {
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 92e92f836..21ca22c5c 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -9,7 +9,8 @@ use languageserver_types::{
     WorkspaceEdit, ParameterInformation, SignatureInformation, Hover, HoverContents,
 };
 use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition};
-use ra_syntax::{TextUnit, text_utils::{contains_offset_nonstrict, intersect}};
+use ra_syntax::{TextUnit, text_utils::intersect};
+use ra_text_edit::text_utils::contains_offset_nonstrict;
 use rustc_hash::FxHashMap;
 use serde_json::to_value;