diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-09 09:56:54 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-09 09:56:54 +0000 |
commit | 34398a8756b56c323d3b4b2ef32fbca32d88a105 (patch) | |
tree | 92ebf0ec790945116e152fce7a9e3cc749c6b8e0 /crates/ra_ide_api_light/src/join_lines.rs | |
parent | 3e8351fb0607f8711749b00d80f68bf25de01a76 (diff) | |
parent | 02dd0cfd8c7bf50cfb26c3c5178be5af4f3fdd25 (diff) |
Merge #766
766: Formatting code into ra_fmt r=matklad a=eulerdisk
As discussed https://github.com/rust-analyzer/rust-analyzer/pull/762#discussion_r254905885
I did only move the code without other improvements.
Co-authored-by: Andrea Pretto <[email protected]>
Diffstat (limited to 'crates/ra_ide_api_light/src/join_lines.rs')
-rw-r--r-- | crates/ra_ide_api_light/src/join_lines.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crates/ra_ide_api_light/src/join_lines.rs b/crates/ra_ide_api_light/src/join_lines.rs index 03770c52e..970afd327 100644 --- a/crates/ra_ide_api_light/src/join_lines.rs +++ b/crates/ra_ide_api_light/src/join_lines.rs | |||
@@ -5,10 +5,11 @@ use ra_syntax::{ | |||
5 | algo::find_covering_node, | 5 | algo::find_covering_node, |
6 | ast, | 6 | ast, |
7 | }; | 7 | }; |
8 | 8 | use ra_fmt::{ | |
9 | compute_ws, extract_trivial_expression | ||
10 | }; | ||
9 | use crate::{ | 11 | use crate::{ |
10 | LocalEdit, TextEditBuilder, | 12 | LocalEdit, TextEditBuilder, |
11 | formatting::{compute_ws, extract_trivial_expression}, | ||
12 | }; | 13 | }; |
13 | 14 | ||
14 | pub fn join_lines(file: &SourceFile, range: TextRange) -> LocalEdit { | 15 | pub fn join_lines(file: &SourceFile, range: TextRange) -> LocalEdit { |