Merge #1012

1012: Move join_lines and test_utils to ra_ide_api r=matklad a=detrumi

Part of #1009 

Co-authored-by: Wilco Kusee <[email protected]>

1 files changed, 13 insertions, 4 deletions

diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index d6f63490d..a838c30da 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,16 @@ 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),
-        )
+        let file_edit = SourceFileEdit {
+            file_id: frange.file_id,
+            edit: join_lines::join_lines(&file, frange.range),
+        };
+        SourceChange {
+            label: "join lines".to_string(),
+            source_file_edits: vec![file_edit],
+            file_system_edits: vec![],
+            cursor_position: None,
+        }
     }
 
     /// Returns an edit which should be applied when opening a new line, fixing