From 58e77660deae23f0a2f5a7c42f52ec7cab707e57 Mon Sep 17 00:00:00 2001
From: Wilco Kusee <wilcokusee@gmail.com>
Date: Thu, 21 Mar 2019 19:51:42 +0100
Subject: [PATCH] Move join_lines to ra_ide_api

---
 Cargo.lock                                                | 1 +
 crates/ra_ide_api/Cargo.toml                              | 1 +
 crates/{ra_ide_api_light => ra_ide_api}/src/join_lines.rs | 5 ++---
 crates/ra_ide_api/src/lib.rs                              | 8 ++++----
 crates/{ra_ide_api_light => ra_ide_api}/src/test_utils.rs | 0
 crates/ra_ide_api_light/src/lib.rs                        | 6 +-----
 crates/ra_ide_api_light/src/typing.rs                     | 2 +-
 7 files changed, 10 insertions(+), 13 deletions(-)
 rename crates/{ra_ide_api_light => ra_ide_api}/src/join_lines.rs (99%)
 rename crates/{ra_ide_api_light => ra_ide_api}/src/test_utils.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 9c7afe74b0d..eafe8d64b55 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1008,6 +1008,7 @@ dependencies = [
  "proptest 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ra_assists 0.1.0",
  "ra_db 0.1.0",
+ "ra_fmt 0.1.0",
  "ra_hir 0.1.0",
  "ra_ide_api_light 0.1.0",
  "ra_syntax 0.1.0",
diff --git a/crates/ra_ide_api/Cargo.toml b/crates/ra_ide_api/Cargo.toml
index ac8c8057bc0..8bd5eec2b38 100644
--- a/crates/ra_ide_api/Cargo.toml
+++ b/crates/ra_ide_api/Cargo.toml
@@ -23,6 +23,7 @@ ra_syntax = { path = "../ra_syntax" }
 ra_ide_api_light = { path = "../ra_ide_api_light" }
 ra_text_edit = { path = "../ra_text_edit" }
 ra_db = { path = "../ra_db" }
+ra_fmt = { path = "../ra_fmt" }
 hir = { path = "../ra_hir", package = "ra_hir" }
 test_utils = { path = "../test_utils" }
 ra_assists = { path = "../ra_assists" }
diff --git a/crates/ra_ide_api_light/src/join_lines.rs b/crates/ra_ide_api/src/join_lines.rs
similarity index 99%
rename from crates/ra_ide_api_light/src/join_lines.rs
rename to crates/ra_ide_api/src/join_lines.rs
index b5bcd62fb21..d6274dc97f5 100644
--- a/crates/ra_ide_api_light/src/join_lines.rs
+++ b/crates/ra_ide_api/src/join_lines.rs
@@ -9,9 +9,8 @@ use ra_syntax::{
 use ra_fmt::{
     compute_ws, extract_trivial_expression
 };
-use crate::{
-    LocalEdit, TextEditBuilder,
-};
+use ra_text_edit::TextEditBuilder;
+use ra_ide_api_light::LocalEdit;
 
 pub fn join_lines(file: &SourceFile, range: TextRange) -> LocalEdit {
     let range = if range.is_empty() {
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index d6f63490dc2..9e76dabff78 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -36,9 +36,12 @@ mod syntax_tree;
 mod line_index;
 mod folding_ranges;
 mod line_index_utils;
+mod join_lines;
 
 #[cfg(test)]
 mod marks;
+#[cfg(test)]
+mod test_utils;
 
 use std::sync::Arc;
 
@@ -276,10 +279,7 @@ impl Analysis {
     /// stuff like trailing commas.
     pub fn join_lines(&self, frange: FileRange) -> SourceChange {
         let file = self.db.parse(frange.file_id);
-        SourceChange::from_local_edit(
-            frange.file_id,
-            ra_ide_api_light::join_lines(&file, frange.range),
-        )
+        SourceChange::from_local_edit(frange.file_id, join_lines::join_lines(&file, frange.range))
     }
 
     /// Returns an edit which should be applied when opening a new line, fixing
diff --git a/crates/ra_ide_api_light/src/test_utils.rs b/crates/ra_ide_api/src/test_utils.rs
similarity index 100%
rename from crates/ra_ide_api_light/src/test_utils.rs
rename to crates/ra_ide_api/src/test_utils.rs
diff --git a/crates/ra_ide_api_light/src/lib.rs b/crates/ra_ide_api_light/src/lib.rs
index 4036a598e51..f21a91e185c 100644
--- a/crates/ra_ide_api_light/src/lib.rs
+++ b/crates/ra_ide_api_light/src/lib.rs
@@ -4,9 +4,6 @@
 //! an edit or some auxiliary info.
 
 mod structure;
-#[cfg(test)]
-mod test_utils;
-mod join_lines;
 mod typing;
 
 use rustc_hash::FxHashSet;
@@ -20,7 +17,6 @@ use ra_syntax::{
 
 pub use crate::{
     structure::{file_structure, StructureNode},
-    join_lines::join_lines,
     typing::{on_enter, on_dot_typed, on_eq_typed},
 };
 
@@ -118,7 +114,7 @@ mod tests {
     use ra_syntax::AstNode;
     use insta::assert_debug_snapshot_matches;
 
-    use crate::test_utils::{add_cursor, assert_eq_text, extract_offset};
+    use test_utils::{add_cursor, assert_eq_text, extract_offset};
 
     use super::*;
 
diff --git a/crates/ra_ide_api_light/src/typing.rs b/crates/ra_ide_api_light/src/typing.rs
index 9dd9f1c1d9f..c69270333c7 100644
--- a/crates/ra_ide_api_light/src/typing.rs
+++ b/crates/ra_ide_api_light/src/typing.rs
@@ -118,7 +118,7 @@ pub fn on_dot_typed(file: &SourceFile, dot_offset: TextUnit) -> Option<LocalEdit
 
 #[cfg(test)]
 mod tests {
-    use crate::test_utils::{add_cursor, assert_eq_text, extract_offset};
+    use test_utils::{add_cursor, assert_eq_text, extract_offset};
 
     use super::*;