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 | |
parent | 8d34262956059aca7e6fded351a9299b3581a5cf (diff) |
Cleanup TextEdit API
Diffstat (limited to 'crates/ra_ide')
-rw-r--r-- | crates/ra_ide/src/diagnostics.rs | 6 | ||||
-rw-r--r-- | crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs | 4 | ||||
-rw-r--r-- | crates/ra_ide/src/join_lines.rs | 4 | ||||
-rw-r--r-- | crates/ra_ide/src/references/rename.rs | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs index 07bf133bd..e006c7775 100644 --- a/crates/ra_ide/src/diagnostics.rs +++ b/crates/ra_ide/src/diagnostics.rs | |||
@@ -14,7 +14,7 @@ use ra_syntax::{ | |||
14 | ast::{self, AstNode}, | 14 | ast::{self, AstNode}, |
15 | SyntaxNode, TextRange, T, | 15 | SyntaxNode, TextRange, T, |
16 | }; | 16 | }; |
17 | use ra_text_edit::{TextEdit, TextEditBuilder}; | 17 | use ra_text_edit::TextEdit; |
18 | 18 | ||
19 | use crate::{Diagnostic, FileId, Fix, SourceFileEdit}; | 19 | use crate::{Diagnostic, FileId, Fix, SourceFileEdit}; |
20 | 20 | ||
@@ -103,7 +103,7 @@ fn check_unnecessary_braces_in_use_statement( | |||
103 | text_edit_for_remove_unnecessary_braces_with_self_in_use_statement(&single_use_tree) | 103 | text_edit_for_remove_unnecessary_braces_with_self_in_use_statement(&single_use_tree) |
104 | .unwrap_or_else(|| { | 104 | .unwrap_or_else(|| { |
105 | let to_replace = single_use_tree.syntax().text().to_string(); | 105 | let to_replace = single_use_tree.syntax().text().to_string(); |
106 | let mut edit_builder = TextEditBuilder::default(); | 106 | let mut edit_builder = TextEdit::builder(); |
107 | edit_builder.delete(use_range); | 107 | edit_builder.delete(use_range); |
108 | edit_builder.insert(use_range.start(), to_replace); | 108 | edit_builder.insert(use_range.start(), to_replace); |
109 | edit_builder.finish() | 109 | edit_builder.finish() |
@@ -149,7 +149,7 @@ fn check_struct_shorthand_initialization( | |||
149 | let field_expr = expr.syntax().text().to_string(); | 149 | let field_expr = expr.syntax().text().to_string(); |
150 | let field_name_is_tup_index = name_ref.as_tuple_field().is_some(); | 150 | let field_name_is_tup_index = name_ref.as_tuple_field().is_some(); |
151 | if field_name == field_expr && !field_name_is_tup_index { | 151 | if field_name == field_expr && !field_name_is_tup_index { |
152 | let mut edit_builder = TextEditBuilder::default(); | 152 | let mut edit_builder = TextEdit::builder(); |
153 | edit_builder.delete(record_field.syntax().text_range()); | 153 | edit_builder.delete(record_field.syntax().text_range()); |
154 | edit_builder.insert(record_field.syntax().text_range().start(), field_name); | 154 | edit_builder.insert(record_field.syntax().text_range().start(), field_name); |
155 | let edit = edit_builder.finish(); | 155 | let edit = edit_builder.finish(); |
diff --git a/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs b/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs index f7c73773f..88e593e00 100644 --- a/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs +++ b/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs | |||
@@ -13,7 +13,7 @@ use ra_ide_db::{ | |||
13 | RootDatabase, | 13 | RootDatabase, |
14 | }; | 14 | }; |
15 | use ra_syntax::{algo, ast, AstNode}; | 15 | use ra_syntax::{algo, ast, AstNode}; |
16 | use ra_text_edit::{TextEdit, TextEditBuilder}; | 16 | use ra_text_edit::TextEdit; |
17 | 17 | ||
18 | /// A [Diagnostic] that potentially has a fix available. | 18 | /// A [Diagnostic] that potentially has a fix available. |
19 | /// | 19 | /// |
@@ -70,7 +70,7 @@ impl DiagnosticWithFix for MissingFields { | |||
70 | } | 70 | } |
71 | 71 | ||
72 | let edit = { | 72 | let edit = { |
73 | let mut builder = TextEditBuilder::default(); | 73 | let mut builder = TextEdit::builder(); |
74 | algo::diff(&old_field_list.syntax(), &new_field_list.syntax()) | 74 | algo::diff(&old_field_list.syntax(), &new_field_list.syntax()) |
75 | .into_text_edit(&mut builder); | 75 | .into_text_edit(&mut builder); |
76 | builder.finish() | 76 | builder.finish() |
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, |
diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs index c8d80fcf7..8c1ac3c56 100644 --- a/crates/ra_ide/src/references/rename.rs +++ b/crates/ra_ide/src/references/rename.rs | |||
@@ -281,7 +281,7 @@ mod tests { | |||
281 | let ra_fixture_after = &trim_indent(ra_fixture_after); | 281 | let ra_fixture_after = &trim_indent(ra_fixture_after); |
282 | let (analysis, position) = analysis_and_position(ra_fixture_before); | 282 | let (analysis, position) = analysis_and_position(ra_fixture_before); |
283 | let source_change = analysis.rename(position, new_name).unwrap(); | 283 | let source_change = analysis.rename(position, new_name).unwrap(); |
284 | let mut text_edit_builder = TextEditBuilder::default(); | 284 | let mut text_edit_builder = TextEdit::builder(); |
285 | let mut file_id: Option<FileId> = None; | 285 | let mut file_id: Option<FileId> = None; |
286 | if let Some(change) = source_change { | 286 | if let Some(change) = source_change { |
287 | for edit in change.info.source_file_edits { | 287 | for edit in change.info.source_file_edits { |