diff options
author | Wilco Kusee <[email protected]> | 2019-03-21 18:51:42 +0000 |
---|---|---|
committer | Wilco Kusee <[email protected]> | 2019-03-22 16:12:31 +0000 |
commit | 58e77660deae23f0a2f5a7c42f52ec7cab707e57 (patch) | |
tree | 282de62356b8019bee8b8b5784aaca0e01e5e81b /crates/ra_ide_api/src/lib.rs | |
parent | 6e324d38d6ef3e250ff32a397f4777699e006f7f (diff) |
Move join_lines to ra_ide_api
Diffstat (limited to 'crates/ra_ide_api/src/lib.rs')
-rw-r--r-- | crates/ra_ide_api/src/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs index d6f63490d..9e76dabff 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,7 @@ 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 | SourceChange::from_local_edit(frange.file_id, join_lines::join_lines(&file, frange.range)) |
280 | frange.file_id, | ||
281 | ra_ide_api_light::join_lines(&file, frange.range), | ||
282 | ) | ||
283 | } | 283 | } |
284 | 284 | ||
285 | /// Returns an edit which should be applied when opening a new line, fixing | 285 | /// Returns an edit which should be applied when opening a new line, fixing |