1 files changed, 12 insertions, 9 deletions

diff --git a/crates/ide/src/diagnostics/fixes.rs b/crates/ide/src/diagnostics/fixes.rs
index ba046232a..13240672f 100644
--- a/crates/ide/src/diagnostics/fixes.rs
+++ b/crates/ide/src/diagnostics/fixes.rs
@@ -6,9 +6,9 @@ use hir::{
         Diagnostic, IncorrectCase, MissingFields, MissingOkInTailExpr, NoSuchField,
         RemoveThisSemicolon, UnresolvedModule,
     },
-    HasSource, HirDisplay, Semantics, VariantDef,
+    HasSource, HirDisplay, InFile, Semantics, VariantDef,
 };
-use ide_db::base_db::FileId;
+use ide_db::base_db::{AnchoredPathBuf, FileId};
 use ide_db::{
     source_change::{FileSystemEdit, SourceFileEdit},
     RootDatabase,
@@ -36,8 +36,10 @@ impl DiagnosticWithFix for UnresolvedModule {
         Some(Fix::new(
             "Create module",
             FileSystemEdit::CreateFile {
-                anchor: self.file.original_file(sema.db),
-                dst: self.candidate.clone(),
+                dst: AnchoredPathBuf {
+                    anchor: self.file.original_file(sema.db),
+                    path: self.candidate.clone(),
+                },
             }
             .into(),
             unresolved_module.syntax().text_range(),
@@ -68,7 +70,8 @@ impl DiagnosticWithFix for MissingFields {
         }
 
         let root = sema.db.parse_or_expand(self.file)?;
-        let old_field_list = self.field_list_parent.to_node(&root).record_expr_field_list()?;
+        let field_list_parent = self.field_list_parent.to_node(&root);
+        let old_field_list = field_list_parent.record_expr_field_list()?;
         let mut new_field_list = old_field_list.clone();
         for f in self.missed_fields.iter() {
             let field =
@@ -85,7 +88,7 @@ impl DiagnosticWithFix for MissingFields {
         Some(Fix::new(
             "Fill struct fields",
             SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into(),
-            sema.original_range(&old_field_list.syntax()).range,
+            sema.original_range(&field_list_parent.syntax()).range,
         ))
     }
 }
@@ -128,9 +131,9 @@ impl DiagnosticWithFix for IncorrectCase {
         let root = sema.db.parse_or_expand(self.file)?;
         let name_node = self.ident.to_node(&root);
 
-        let file_id = self.file.original_file(sema.db);
-        let offset = name_node.syntax().text_range().start();
-        let file_position = FilePosition { file_id, offset };
+        let name_node = InFile::new(self.file, name_node.syntax());
+        let frange = name_node.original_file_range(sema.db);
+        let file_position = FilePosition { file_id: frange.file_id, offset: frange.range.start() };
 
         let rename_changes =
             rename_with_semantics(sema, file_position, &self.suggested_text).ok()?;