diff options
Diffstat (limited to 'crates/ra_ide_api/src/lib.rs')
-rw-r--r-- | crates/ra_ide_api/src/lib.rs | 17 |
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; | |||
36 | mod line_index; | 36 | mod line_index; |
37 | mod folding_ranges; | 37 | mod folding_ranges; |
38 | mod line_index_utils; | 38 | mod line_index_utils; |
39 | mod join_lines; | ||
39 | 40 | ||
40 | #[cfg(test)] | 41 | #[cfg(test)] |
41 | mod marks; | 42 | mod marks; |
43 | #[cfg(test)] | ||
44 | mod test_utils; | ||
42 | 45 | ||
43 | use std::sync::Arc; | 46 | use std::sync::Arc; |
44 | 47 | ||
@@ -276,10 +279,16 @@ impl Analysis { | |||
276 | /// stuff like trailing commas. | 279 | /// stuff like trailing commas. |
277 | pub fn join_lines(&self, frange: FileRange) -> SourceChange { | 280 | pub fn join_lines(&self, frange: FileRange) -> SourceChange { |
278 | let file = self.db.parse(frange.file_id); | 281 | let file = self.db.parse(frange.file_id); |
279 | SourceChange::from_local_edit( | 282 | let file_edit = SourceFileEdit { |
280 | frange.file_id, | 283 | file_id: frange.file_id, |
281 | ra_ide_api_light::join_lines(&file, frange.range), | 284 | edit: join_lines::join_lines(&file, frange.range), |
282 | ) | 285 | }; |
286 | SourceChange { | ||
287 | label: "join lines".to_string(), | ||
288 | source_file_edits: vec![file_edit], | ||
289 | file_system_edits: vec![], | ||
290 | cursor_position: None, | ||
291 | } | ||
283 | } | 292 | } |
284 | 293 | ||
285 | /// Returns an edit which should be applied when opening a new line, fixing | 294 | /// Returns an edit which should be applied when opening a new line, fixing |