diff options
author | Aleksey Kladov <[email protected]> | 2020-08-12 15:58:56 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-08-12 15:58:56 +0100 |
commit | 7510048ec0a5d5e7136e3ea258954eb244d15baf (patch) | |
tree | 97a472bf38e4e3e079db27abf1f2c7b523a0d0b1 /crates/ra_ide/src/join_lines.rs | |
parent | 8d34262956059aca7e6fded351a9299b3581a5cf (diff) |
Cleanup TextEdit API
Diffstat (limited to 'crates/ra_ide/src/join_lines.rs')
-rw-r--r-- | crates/ra_ide/src/join_lines.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs index 6907c09e8..1c881386f 100644 --- a/crates/ra_ide/src/join_lines.rs +++ b/crates/ra_ide/src/join_lines.rs | |||
@@ -23,7 +23,7 @@ pub fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit { | |||
23 | let syntax = file.syntax(); | 23 | let syntax = file.syntax(); |
24 | let text = syntax.text().slice(range.start()..); | 24 | let text = syntax.text().slice(range.start()..); |
25 | let pos = match text.find_char('\n') { | 25 | let pos = match text.find_char('\n') { |
26 | None => return TextEditBuilder::default().finish(), | 26 | None => return TextEdit::builder().finish(), |
27 | Some(pos) => pos, | 27 | Some(pos) => pos, |
28 | }; | 28 | }; |
29 | TextRange::at(range.start() + pos, TextSize::of('\n')) | 29 | TextRange::at(range.start() + pos, TextSize::of('\n')) |
@@ -35,7 +35,7 @@ pub fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit { | |||
35 | NodeOrToken::Node(node) => node, | 35 | NodeOrToken::Node(node) => node, |
36 | NodeOrToken::Token(token) => token.parent(), | 36 | NodeOrToken::Token(token) => token.parent(), |
37 | }; | 37 | }; |
38 | let mut edit = TextEditBuilder::default(); | 38 | let mut edit = TextEdit::builder(); |
39 | for token in node.descendants_with_tokens().filter_map(|it| it.into_token()) { | 39 | for token in node.descendants_with_tokens().filter_map(|it| it.into_token()) { |
40 | let range = match range.intersect(token.text_range()) { | 40 | let range = match range.intersect(token.text_range()) { |
41 | Some(range) => range, | 41 | Some(range) => range, |