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 | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/crates/test-fixture/src/lib.rs b/crates/test-fixture/src/lib.rs index a718b96a82..457cd3ac85 100644 --- a/crates/test-fixture/src/lib.rs +++ b/crates/test-fixture/src/lib.rs @@ -5,7 +5,7 @@ use base_db::target::TargetData; use base_db::{ Crate, CrateDisplayName, CrateGraphBuilder, CrateName, CrateOrigin, CrateWorkspaceData, DependencyBuilder, Env, FileChange, FileSet, FxIndexMap, LangCrateOrigin, SourceDatabase, - SourceRoot, Version, VfsPath, salsa, + SourceRoot, Version, VfsPath, }; use cfg::CfgOptions; use hir_expand::{ @@ -37,10 +37,11 @@ pub trait WithFixture: Default + ExpandDatabase + SourceDatabase + 'static { #[rust_analyzer::rust_fixture] ra_fixture: &str, ) -> (Self, EditionedFileId) { let mut db = Self::default(); - let fixture = ChangeFixture::parse(&db, ra_fixture); + let fixture = ChangeFixture::parse(ra_fixture); fixture.change.apply(&mut db); assert_eq!(fixture.files.len(), 1, "Multiple file found in the fixture"); - (db, fixture.files[0]) + let file = EditionedFileId::from_span_guess_origin(&db, fixture.files[0]); + (db, file) } #[track_caller] @@ -48,16 +49,21 @@ pub trait WithFixture: Default + ExpandDatabase + SourceDatabase + 'static { #[rust_analyzer::rust_fixture] ra_fixture: &str, ) -> (Self, Vec<EditionedFileId>) { let mut db = Self::default(); - let fixture = ChangeFixture::parse(&db, ra_fixture); + let fixture = ChangeFixture::parse(ra_fixture); fixture.change.apply(&mut db); assert!(fixture.file_position.is_none()); - (db, fixture.files) + let files = fixture + .files + .into_iter() + .map(|file| EditionedFileId::from_span_guess_origin(&db, file)) + .collect(); + (db, files) } #[track_caller] fn with_files(#[rust_analyzer::rust_fixture] ra_fixture: &str) -> Self { let mut db = Self::default(); - let fixture = ChangeFixture::parse(&db, ra_fixture); + let fixture = ChangeFixture::parse(ra_fixture); fixture.change.apply(&mut db); assert!(fixture.file_position.is_none()); db @@ -69,12 +75,8 @@ pub trait WithFixture: Default + ExpandDatabase + SourceDatabase + 'static { proc_macros: Vec<(String, ProcMacro)>, ) -> Self { let mut db = Self::default(); - let fixture = ChangeFixture::parse_with_proc_macros( - &db, - ra_fixture, - MiniCore::RAW_SOURCE, - proc_macros, - ); + let fixture = + ChangeFixture::parse_with_proc_macros(ra_fixture, MiniCore::RAW_SOURCE, proc_macros); fixture.change.apply(&mut db); assert!(fixture.file_position.is_none()); db @@ -99,12 +101,13 @@ pub trait WithFixture: Default + ExpandDatabase + SourceDatabase + 'static { #[rust_analyzer::rust_fixture] ra_fixture: &str, ) -> (Self, EditionedFileId, RangeOrOffset) { let mut db = Self::default(); - let fixture = ChangeFixture::parse(&db, ra_fixture); + let fixture = ChangeFixture::parse(ra_fixture); fixture.change.apply(&mut db); 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); (db, file_id, range_or_offset) } @@ -116,9 +119,9 @@ pub trait WithFixture: Default + ExpandDatabase + SourceDatabase + 'static { impl<DB: ExpandDatabase + SourceDatabase + Default + 'static> WithFixture for DB {} pub struct ChangeFixture { - pub file_position: Option<(EditionedFileId, RangeOrOffset)>, + pub file_position: Option<(span::EditionedFileId, RangeOrOffset)>, pub file_lines: Vec<usize>, - pub files: Vec<EditionedFileId>, + pub files: Vec<span::EditionedFileId>, pub change: ChangeWithProcMacros, pub sysroot_files: Vec<FileId>, } @@ -126,15 +129,11 @@ pub struct ChangeFixture { const SOURCE_ROOT_PREFIX: &str = "/"; impl ChangeFixture { - pub fn parse( - db: &dyn salsa::Database, - #[rust_analyzer::rust_fixture] ra_fixture: &str, - ) -> ChangeFixture { - Self::parse_with_proc_macros(db, ra_fixture, MiniCore::RAW_SOURCE, Vec::new()) + pub fn parse(#[rust_analyzer::rust_fixture] ra_fixture: &str) -> ChangeFixture { + Self::parse_with_proc_macros(ra_fixture, MiniCore::RAW_SOURCE, Vec::new()) } pub fn parse_with_proc_macros( - db: &dyn salsa::Database, #[rust_analyzer::rust_fixture] ra_fixture: &str, minicore_raw: &str, mut proc_macro_defs: Vec<(String, ProcMacro)>, @@ -202,7 +201,7 @@ impl ChangeFixture { let meta = FileMeta::from_fixture(entry, current_source_root_kind); if let Some(range_or_offset) = range_or_offset { file_position = - Some((EditionedFileId::new(db, file_id, meta.edition), range_or_offset)); + Some((span::EditionedFileId::new(file_id, meta.edition), range_or_offset)); } assert!(meta.path.starts_with(SOURCE_ROOT_PREFIX)); @@ -259,7 +258,7 @@ impl ChangeFixture { source_change.change_file(file_id, Some(text)); let path = VfsPath::new_virtual_path(meta.path); file_set.insert(file_id, path); - files.push(EditionedFileId::new(db, file_id, meta.edition)); + files.push(span::EditionedFileId::new(file_id, meta.edition)); file_id = FileId::from_raw(file_id.index() + 1); } |