Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite fixtures on top of Change

Browse source
This commit is contained in:
Aleksey Kladov 2020-10-02 16:07:33 +02:00
parent 8716c4cec3
commit eeb27f95f1
1 changed files with 87 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
crates/base_db/src/fixture.rs
View file

@ -65,24 +65,26 @@ use test_utils::{extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER}
use vfs::{file_set::FileSet, VfsPath}; use vfs::{file_set::FileSet, VfsPath};
use crate::{ use crate::{
input::CrateName, CrateGraph, CrateId, Edition, Env, FileId, FilePosition, SourceDatabaseExt, input::CrateName, Change, CrateGraph, CrateId, Edition, Env, FileId, FilePosition,
SourceRoot, SourceRootId, SourceDatabaseExt, SourceRoot, SourceRootId,
}; };
pub const WORKSPACE: SourceRootId = SourceRootId(0); pub const WORKSPACE: SourceRootId = SourceRootId(0);
pub trait WithFixture: Default + SourceDatabaseExt + 'static { pub trait WithFixture: Default + SourceDatabaseExt + 'static {
fn with_single_file(text: &str) -> (Self, FileId) { fn with_single_file(text: &str) -> (Self, FileId) {
let fixture = ChangeFixture::parse(text);
let mut db = Self::default(); let mut db = Self::default();
let (_, files) = with_files(&mut db, text); fixture.change.apply(&mut db);
assert_eq!(files.len(), 1); assert_eq!(fixture.files.len(), 1);
(db, files[0]) (db, fixture.files[0])
} }
fn with_files(ra_fixture: &str) -> Self { fn with_files(ra_fixture: &str) -> Self {
let fixture = ChangeFixture::parse(ra_fixture);
let mut db = Self::default(); let mut db = Self::default();
let (pos, _) = with_files(&mut db, ra_fixture); fixture.change.apply(&mut db);
assert!(pos.is_none()); assert!(fixture.file_position.is_none());
db db
} }
@ -96,9 +98,10 @@ pub trait WithFixture: Default + SourceDatabaseExt + 'static {
} }
fn with_range_or_offset(ra_fixture: &str) -> (Self, FileId, RangeOrOffset) { fn with_range_or_offset(ra_fixture: &str) -> (Self, FileId, RangeOrOffset) {
let fixture = ChangeFixture::parse(ra_fixture);
let mut db = Self::default(); let mut db = Self::default();
let (pos, _) = with_files(&mut db, ra_fixture); fixture.change.apply(&mut db);
let (file_id, range_or_offset) = pos.unwrap(); let (file_id, range_or_offset) = fixture.file_position.unwrap();
(db, file_id, range_or_offset) (db, file_id, range_or_offset)
} }
@ -113,11 +116,16 @@ pub trait WithFixture: Default + SourceDatabaseExt + 'static {
impl<DB: SourceDatabaseExt + Default + 'static> WithFixture for DB {} impl<DB: SourceDatabaseExt + Default + 'static> WithFixture for DB {}
fn with_files( pub struct ChangeFixture {
db: &mut dyn SourceDatabaseExt, file_position: Option<(FileId, RangeOrOffset)>,
fixture: &str, files: Vec<FileId>,
) -> (Option<(FileId, RangeOrOffset)>, Vec<FileId>) { change: Change,
let fixture = Fixture::parse(fixture); }
impl ChangeFixture {
fn parse(ra_fixture: &str) -> ChangeFixture {
let fixture = Fixture::parse(ra_fixture);
let mut change = Change::new();
let mut files = Vec::new(); let mut files = Vec::new();
let mut crate_graph = CrateGraph::default(); let mut crate_graph = CrateGraph::default();
@ -126,7 +134,6 @@ fn with_files(
let mut default_crate_root: Option<FileId> = None; let mut default_crate_root: Option<FileId> = None;
let mut file_set = FileSet::default(); let mut file_set = FileSet::default();
let source_root_id = WORKSPACE;
let source_root_prefix = "/".to_string(); let source_root_prefix = "/".to_string();
let mut file_id = FileId(0); let mut file_id = FileId(0);
@ -166,8 +173,7 @@ fn with_files(
default_crate_root = Some(file_id); default_crate_root = Some(file_id);
} }
db.set_file_text(file_id, Arc::new(text)); change.change_file(file_id, Some(Arc::new(text)));
db.set_file_source_root(file_id, source_root_id);
let path = VfsPath::new_virtual_path(meta.path); let path = VfsPath::new_virtual_path(meta.path);
file_set.insert(file_id, path.into()); file_set.insert(file_id, path.into());
files.push(file_id); files.push(file_id);
@ -192,10 +198,11 @@ fn with_files(
} }
} }
db.set_source_root(source_root_id, Arc::new(SourceRoot::new_local(file_set))); change.set_roots(vec![SourceRoot::new_local(file_set)]);
db.set_crate_graph(Arc::new(crate_graph)); change.set_crate_graph(crate_graph);
(file_position, files) ChangeFixture { file_position, files, change }
}
} }
struct FileMeta { struct FileMeta {