1 files changed, 21 insertions, 21 deletions

diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs
index 301629763..8cbe1ae5a 100644
--- a/crates/ide/src/references/rename.rs
+++ b/crates/ide/src/references/rename.rs
@@ -275,11 +275,11 @@ mod tests {
     use test_utils::{assert_eq_text, mark};
     use text_edit::TextEdit;
 
-    use crate::{mock_analysis::analysis_and_position, FileId};
+    use crate::{fixture, FileId};
 
     fn check(new_name: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
         let ra_fixture_after = &trim_indent(ra_fixture_after);
-        let (analysis, position) = analysis_and_position(ra_fixture_before);
+        let (analysis, position) = fixture::position(ra_fixture_before);
         let source_change = analysis.rename(position, new_name).unwrap();
         let mut text_edit_builder = TextEdit::builder();
         let mut file_id: Option<FileId> = None;
@@ -297,7 +297,7 @@ mod tests {
     }
 
     fn check_expect(new_name: &str, ra_fixture: &str, expect: Expect) {
-        let (analysis, position) = analysis_and_position(ra_fixture);
+        let (analysis, position) = fixture::position(ra_fixture);
         let source_change = analysis.rename(position, new_name).unwrap().unwrap();
         expect.assert_debug_eq(&source_change)
     }
@@ -314,7 +314,7 @@ mod tests {
 
     #[test]
     fn test_rename_to_invalid_identifier() {
-        let (analysis, position) = analysis_and_position(r#"fn main() { let i<|> = 1; }"#);
+        let (analysis, position) = fixture::position(r#"fn main() { let i<|> = 1; }"#);
         let new_name = "invalid!";
         let source_change = analysis.rename(position, new_name).unwrap();
         assert!(source_change.is_none());
@@ -602,7 +602,7 @@ mod foo<|>;
                         source_file_edits: [
                             SourceFileEdit {
                                 file_id: FileId(
-                                    2,
+                                    1,
                                 ),
                                 edit: TextEdit {
                                     indels: [
@@ -617,10 +617,10 @@ mod foo<|>;
                         file_system_edits: [
                             MoveFile {
                                 src: FileId(
-                                    3,
+                                    2,
                                 ),
                                 anchor: FileId(
-                                    3,
+                                    2,
                                 ),
                                 dst: "foo2.rs",
                             },
@@ -655,7 +655,7 @@ use crate::foo<|>::FooContent;
                         source_file_edits: [
                             SourceFileEdit {
                                 file_id: FileId(
-                                    1,
+                                    0,
                                 ),
                                 edit: TextEdit {
                                     indels: [
@@ -668,7 +668,7 @@ use crate::foo<|>::FooContent;
                             },
                             SourceFileEdit {
                                 file_id: FileId(
-                                    3,
+                                    2,
                                 ),
                                 edit: TextEdit {
                                     indels: [
@@ -683,10 +683,10 @@ use crate::foo<|>::FooContent;
                         file_system_edits: [
                             MoveFile {
                                 src: FileId(
-                                    2,
+                                    1,
                                 ),
                                 anchor: FileId(
-                                    2,
+                                    1,
                                 ),
                                 dst: "quux.rs",
                             },
@@ -715,7 +715,7 @@ mod fo<|>o;
                         source_file_edits: [
                             SourceFileEdit {
                                 file_id: FileId(
-                                    1,
+                                    0,
                                 ),
                                 edit: TextEdit {
                                     indels: [
@@ -730,10 +730,10 @@ mod fo<|>o;
                         file_system_edits: [
                             MoveFile {
                                 src: FileId(
-                                    2,
+                                    1,
                                 ),
                                 anchor: FileId(
-                                    2,
+                                    1,
                                 ),
                                 dst: "../foo2/mod.rs",
                             },
@@ -763,7 +763,7 @@ mod outer { mod fo<|>o; }
                         source_file_edits: [
                             SourceFileEdit {
                                 file_id: FileId(
-                                    1,
+                                    0,
                                 ),
                                 edit: TextEdit {
                                     indels: [
@@ -778,10 +778,10 @@ mod outer { mod fo<|>o; }
                         file_system_edits: [
                             MoveFile {
                                 src: FileId(
-                                    2,
+                                    1,
                                 ),
                                 anchor: FileId(
-                                    2,
+                                    1,
                                 ),
                                 dst: "bar.rs",
                             },
@@ -834,7 +834,7 @@ pub mod foo<|>;
                         source_file_edits: [
                             SourceFileEdit {
                                 file_id: FileId(
-                                    2,
+                                    1,
                                 ),
                                 edit: TextEdit {
                                     indels: [
@@ -847,7 +847,7 @@ pub mod foo<|>;
                             },
                             SourceFileEdit {
                                 file_id: FileId(
-                                    1,
+                                    0,
                                 ),
                                 edit: TextEdit {
                                     indels: [
@@ -862,10 +862,10 @@ pub mod foo<|>;
                         file_system_edits: [
                             MoveFile {
                                 src: FileId(
-                                    3,
+                                    2,
                                 ),
                                 anchor: FileId(
-                                    3,
+                                    2,
                                 ),
                                 dst: "foo2.rs",
                             },