dont depend on ra_editor directly

diff --git a/Cargo.lock b/Cargo.lock
index 949a58e86e5c47296639213a20e3c7df1df3e4af..a981989dc87d0f8bdcc9788b7bd4558fb1004015 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -736,7 +736,6 @@ dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ra_analysis 0.1.0",
- "ra_editor 0.1.0",
  "ra_syntax 0.1.0",
  "ra_text_edit 0.1.0",
  "ra_vfs 0.1.0",

diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index 771a349c8c6e6cf390074c41bf2fedb46b2bc06e..a3b350ad74628f6a6ca28698eab13c765dbd3371 100644 (file)
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -40,7 +40,10 @@ macro_rules! ctry {
     completion::{CompletionItem, CompletionItemKind, InsertText},
     runnables::{Runnable, RunnableKind},
 };
-pub use ra_editor::{Fold, FoldKind, HighlightedRange, LineIndex, Severity, StructureNode};
+pub use ra_editor::{
+    Fold, FoldKind, HighlightedRange, Severity, StructureNode,
+    LineIndex, LineCol, translate_offset_with_edit,
+};
 
 pub use ra_db::{
     Cancelable, Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, FilesDatabase,

diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index 8bd4caa53db08c38b6347619ebf40aeecb12b6a6..b9fd61105c609ce20f9eb79333bc9a772064a5e0 100644 (file)
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -28,7 +28,6 @@ parking_lot = "0.7.0"
 
 thread_worker = { path = "../thread_worker" }
 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 e8eb3940f99c0c1c07fb5c26d61d8cbd723d9ccb..b3f8c83ccdf3d3dae55df1472a6ae0afeae1e857 100644 (file)
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -7,8 +7,8 @@
 use ra_analysis::{
     CompletionItem, CompletionItemKind, FileId, FilePosition, FileRange, FileSystemEdit,
     InsertText, NavigationTarget, SourceChange, SourceFileEdit,
+    LineCol, LineIndex, translate_offset_with_edit
 };
-use ra_editor::{translate_offset_with_edit, LineCol, LineIndex};
 use ra_syntax::{SyntaxKind, TextRange, TextUnit};
 use ra_text_edit::{AtomTextEdit, TextEdit};