Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/test-fixture/src/lib.rs')
| -rw-r--r-- | crates/test-fixture/src/lib.rs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crates/test-fixture/src/lib.rs b/crates/test-fixture/src/lib.rs index ca68edd88c..93d4650cd3 100644 --- a/crates/test-fixture/src/lib.rs +++ b/crates/test-fixture/src/lib.rs @@ -149,8 +149,9 @@ pub trait WithFixture: Default + ExpandDatabase + SourceDatabase + 'static { let fixture = ChangeFixture::parse(ra_fixture); fixture.change.apply(&mut db); assert_eq!(fixture.files.len(), 1, "Multiple file found in the fixture"); - let file = EditionedFileId::from_span_guess_origin(&db, fixture.files[0]); - (db, file) + let &krate = db.relevant_crates(fixture.files[0].file_id()).first().unwrap(); + let file_id = EditionedFileId::from_span(&db, fixture.files[0], krate); + (db, file_id) } /// See the trait documentation for more information on fixtures. @@ -165,7 +166,10 @@ pub trait WithFixture: Default + ExpandDatabase + SourceDatabase + 'static { let files = fixture .files .into_iter() - .map(|file| EditionedFileId::from_span_guess_origin(&db, file)) + .map(|file| { + let &krate = db.relevant_crates(file.file_id()).first().unwrap(); + EditionedFileId::from_span(&db, file, krate) + }) .collect(); (db, files) } @@ -222,7 +226,8 @@ pub trait WithFixture: Default + ExpandDatabase + SourceDatabase + 'static { let (file_id, range_or_offset) = fixture .file_position .expect("Could not find file position in fixture. Did you forget to add an `$0`?"); - let file_id = EditionedFileId::from_span_guess_origin(&db, file_id); + let &krate = db.relevant_crates(file_id.file_id()).first().unwrap(); + let file_id = EditionedFileId::from_span(&db, file_id, krate); (db, file_id, range_or_offset) } |