Group file source edits by FileId

2 files changed, 12 insertions, 13 deletions

diff --git a/crates/ide/src/diagnostics/field_shorthand.rs b/crates/ide/src/diagnostics/field_shorthand.rs
index 16c6ea827..f4ec51b64 100644
--- a/crates/ide/src/diagnostics/field_shorthand.rs
+++ b/crates/ide/src/diagnostics/field_shorthand.rs
@@ -1,8 +1,7 @@
 //! Suggests shortening `Foo { field: field }` to `Foo { field }` in both
 //! expressions and patterns.
 
-use ide_db::base_db::FileId;
-use ide_db::source_change::SourceFileEdit;
+use ide_db::{base_db::FileId, source_change::SourceFileEdits};
 use syntax::{ast, match_ast, AstNode, SyntaxNode};
 use text_edit::TextEdit;
 
@@ -50,7 +49,7 @@ fn check_expr_field_shorthand(
             Diagnostic::hint(field_range, "Shorthand struct initialization".to_string()).with_fix(
                 Some(Fix::new(
                     "Use struct shorthand initialization",
-                    SourceFileEdit { file_id, edit }.into(),
+                    SourceFileEdits::from_text_edit(file_id, edit).into(),
                     field_range,
                 )),
             ),
@@ -89,7 +88,7 @@ fn check_pat_field_shorthand(
         acc.push(Diagnostic::hint(field_range, "Shorthand struct pattern".to_string()).with_fix(
             Some(Fix::new(
                 "Use struct field shorthand",
-                SourceFileEdit { file_id, edit }.into(),
+                SourceFileEdits::from_text_edit(file_id, edit).into(),
                 field_range,
             )),
         ));
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::{
     },
     HasSource, HirDisplay, InFile, Semantics, VariantDef,
 };
-use ide_db::base_db::{AnchoredPathBuf, FileId};
 use ide_db::{
-    source_change::{FileSystemEdit, SourceFileEdit},
+    base_db::{AnchoredPathBuf, FileId},
+    source_change::{FileSystemEdit, SourceFileEdits},
     RootDatabase,
 };
 use syntax::{
@@ -88,7 +88,7 @@ impl DiagnosticWithFix for MissingFields {
         };
         Some(Fix::new(
             "Fill struct fields",
-            SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into(),
+            SourceFileEdits::from_text_edit(self.file.original_file(sema.db), edit).into(),
             sema.original_range(&field_list_parent.syntax()).range,
         ))
     }
@@ -102,7 +102,7 @@ impl DiagnosticWithFix for MissingOkOrSomeInTailExpr {
         let replacement = format!("{}({})", self.required, tail_expr.syntax());
         let edit = TextEdit::replace(tail_expr_range, replacement);
         let source_change =
-            SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into();
+            SourceFileEdits::from_text_edit(self.file.original_file(sema.db), edit).into();
         let name = if self.required == "Ok" { "Wrap with Ok" } else { "Wrap with Some" };
         Some(Fix::new(name, source_change, tail_expr_range))
     }
@@ -123,7 +123,7 @@ impl DiagnosticWithFix for RemoveThisSemicolon {
 
         let edit = TextEdit::delete(semicolon);
         let source_change =
-            SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into();
+            SourceFileEdits::from_text_edit(self.file.original_file(sema.db), edit).into();
 
         Some(Fix::new("Remove this semicolon", source_change, semicolon))
     }
@@ -204,10 +204,10 @@ fn missing_record_expr_field_fix(
         new_field = format!(",{}", new_field);
     }
 
-    let source_change = SourceFileEdit {
-        file_id: def_file_id,
-        edit: TextEdit::insert(last_field_syntax.text_range().end(), new_field),
-    };
+    let source_change = SourceFileEdits::from_text_edit(
+        def_file_id,
+        TextEdit::insert(last_field_syntax.text_range().end(), new_field),
+    );
     return Some(Fix::new(
         "Create field",
         source_change.into(),