diff options
Diffstat (limited to 'crates/ide/src/diagnostics/fixes.rs')
-rw-r--r-- | crates/ide/src/diagnostics/fixes.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crates/ide/src/diagnostics/fixes.rs b/crates/ide/src/diagnostics/fixes.rs index d7ad88ed5..b04964ccd 100644 --- a/crates/ide/src/diagnostics/fixes.rs +++ b/crates/ide/src/diagnostics/fixes.rs | |||
@@ -8,9 +8,9 @@ use hir::{ | |||
8 | }, | 8 | }, |
9 | HasSource, HirDisplay, InFile, Semantics, VariantDef, | 9 | HasSource, HirDisplay, InFile, Semantics, VariantDef, |
10 | }; | 10 | }; |
11 | use ide_db::base_db::{AnchoredPathBuf, FileId}; | ||
12 | use ide_db::{ | 11 | use ide_db::{ |
13 | source_change::{FileSystemEdit, SourceFileEdit}, | 12 | base_db::{AnchoredPathBuf, FileId}, |
13 | source_change::{FileSystemEdit, SourceFileEdits}, | ||
14 | RootDatabase, | 14 | RootDatabase, |
15 | }; | 15 | }; |
16 | use syntax::{ | 16 | use syntax::{ |
@@ -88,7 +88,7 @@ impl DiagnosticWithFix for MissingFields { | |||
88 | }; | 88 | }; |
89 | Some(Fix::new( | 89 | Some(Fix::new( |
90 | "Fill struct fields", | 90 | "Fill struct fields", |
91 | SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into(), | 91 | SourceFileEdits::from_text_edit(self.file.original_file(sema.db), edit).into(), |
92 | sema.original_range(&field_list_parent.syntax()).range, | 92 | sema.original_range(&field_list_parent.syntax()).range, |
93 | )) | 93 | )) |
94 | } | 94 | } |
@@ -102,7 +102,7 @@ impl DiagnosticWithFix for MissingOkOrSomeInTailExpr { | |||
102 | let replacement = format!("{}({})", self.required, tail_expr.syntax()); | 102 | let replacement = format!("{}({})", self.required, tail_expr.syntax()); |
103 | let edit = TextEdit::replace(tail_expr_range, replacement); | 103 | let edit = TextEdit::replace(tail_expr_range, replacement); |
104 | let source_change = | 104 | let source_change = |
105 | SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into(); | 105 | SourceFileEdits::from_text_edit(self.file.original_file(sema.db), edit).into(); |
106 | let name = if self.required == "Ok" { "Wrap with Ok" } else { "Wrap with Some" }; | 106 | let name = if self.required == "Ok" { "Wrap with Ok" } else { "Wrap with Some" }; |
107 | Some(Fix::new(name, source_change, tail_expr_range)) | 107 | Some(Fix::new(name, source_change, tail_expr_range)) |
108 | } | 108 | } |
@@ -123,7 +123,7 @@ impl DiagnosticWithFix for RemoveThisSemicolon { | |||
123 | 123 | ||
124 | let edit = TextEdit::delete(semicolon); | 124 | let edit = TextEdit::delete(semicolon); |
125 | let source_change = | 125 | let source_change = |
126 | SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into(); | 126 | SourceFileEdits::from_text_edit(self.file.original_file(sema.db), edit).into(); |
127 | 127 | ||
128 | Some(Fix::new("Remove this semicolon", source_change, semicolon)) | 128 | Some(Fix::new("Remove this semicolon", source_change, semicolon)) |
129 | } | 129 | } |
@@ -204,10 +204,10 @@ fn missing_record_expr_field_fix( | |||
204 | new_field = format!(",{}", new_field); | 204 | new_field = format!(",{}", new_field); |
205 | } | 205 | } |
206 | 206 | ||
207 | let source_change = SourceFileEdit { | 207 | let source_change = SourceFileEdits::from_text_edit( |
208 | file_id: def_file_id, | 208 | def_file_id, |
209 | edit: TextEdit::insert(last_field_syntax.text_range().end(), new_field), | 209 | TextEdit::insert(last_field_syntax.text_range().end(), new_field), |
210 | }; | 210 | ); |
211 | return Some(Fix::new( | 211 | return Some(Fix::new( |
212 | "Create field", | 212 | "Create field", |
213 | source_change.into(), | 213 | source_change.into(), |