language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Handle SourceRoots automatically in fixtures

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-11 12:53:10 +03:00
parent 81852f6dd2
commit dced2f4ed4
2 changed files with 78 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

88
crates/ra_hir/src/mock.rs
View file

@ -6,6 +6,7 @@ use ra_db::{
}; };
use relative_path::RelativePathBuf; use relative_path::RelativePathBuf;
use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset}; use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset};
use rustc_hash::FxHashMap;
use crate::{db, HirInterner}; use crate::{db, HirInterner};
@ -21,82 +22,107 @@ pub struct MockDatabase {
events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>, events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>,
runtime: salsa::Runtime<MockDatabase>, runtime: salsa::Runtime<MockDatabase>,
interner: Arc<HirInterner>, interner: Arc<HirInterner>,
file_counter: u32, files: FxHashMap<String, FileId>,
} }
impl panic::RefUnwindSafe for MockDatabase {} impl panic::RefUnwindSafe for MockDatabase {}
impl MockDatabase { impl MockDatabase {
pub fn with_files(fixture: &str) -> (MockDatabase, SourceRoot) { pub fn with_files(fixture: &str) -> MockDatabase {
let (db, source_root, position) = MockDatabase::from_fixture(fixture); let (db, position) = MockDatabase::from_fixture(fixture);
assert!(position.is_none()); assert!(position.is_none());
(db, source_root) db
} }
pub fn with_single_file(text: &str) -> (MockDatabase, SourceRoot, FileId) { pub fn with_single_file(text: &str) -> (MockDatabase, SourceRoot, FileId) {
let mut db = MockDatabase::default(); let mut db = MockDatabase::default();
let mut source_root = SourceRoot::default(); let mut source_root = SourceRoot::default();
let file_id = db.add_file(WORKSPACE, &mut source_root, "/main.rs", text); let file_id = db.add_file(WORKSPACE, "/", &mut source_root, "/main.rs", text);
db.set_source_root(WORKSPACE, Arc::new(source_root.clone())); db.set_source_root(WORKSPACE, Arc::new(source_root.clone()));
(db, source_root, file_id) (db, source_root, file_id)
} }
pub fn with_position(fixture: &str) -> (MockDatabase, FilePosition) { pub fn with_position(fixture: &str) -> (MockDatabase, FilePosition) {
let (db, _, position) = MockDatabase::from_fixture(fixture); let (db, position) = MockDatabase::from_fixture(fixture);
let position = position.expect("expected a marker ( <|> )"); let position = position.expect("expected a marker ( <|> )");
(db, position) (db, position)
} }
fn from_fixture(fixture: &str) -> (MockDatabase, SourceRoot, Option<FilePosition>) { pub fn file_id_of(&self, path: &str) -> FileId {
let mut db = MockDatabase::default(); match self.files.get(path) {
Some(it) => *it,
let (source_root, pos) = db.add_fixture(WORKSPACE, fixture); None => panic!("unknown file: {:?}\nexisting files:\n{:#?}", path, self.files),
}
(db, source_root, pos)
} }
pub fn add_fixture( fn from_fixture(fixture: &str) -> (MockDatabase, Option<FilePosition>) {
&mut self, let mut db = MockDatabase::default();
source_root_id: SourceRootId,
fixture: &str, let pos = db.add_fixture(fixture);
) -> (SourceRoot, Option<FilePosition>) {
(db, pos)
}
fn add_fixture(&mut self, fixture: &str) -> Option<FilePosition> {
let mut position = None; let mut position = None;
let mut source_root = SourceRoot::default(); let mut source_root = SourceRoot::default();
let mut source_root_id = WORKSPACE;
let mut source_root_prefix = "/".to_string();
for entry in parse_fixture(fixture) { for entry in parse_fixture(fixture) {
if entry.meta.starts_with("root") {
self.set_source_root(source_root_id, Arc::new(source_root));
source_root = SourceRoot::default();
source_root_id = SourceRootId(source_root_id.0 + 1);
source_root_prefix = entry.meta["root".len()..].trim().to_string();
continue;
}
if entry.text.contains(CURSOR_MARKER) { if entry.text.contains(CURSOR_MARKER) {
assert!(position.is_none(), "only one marker (<|>) per fixture is allowed"); assert!(position.is_none(), "only one marker (<|>) per fixture is allowed");
position = Some(self.add_file_with_position( position = Some(self.add_file_with_position(
source_root_id, source_root_id,
&source_root_prefix,
&mut source_root, &mut source_root,
&entry.meta, &entry.meta,
&entry.text, &entry.text,
)); ));
} else { } else {
self.add_file(source_root_id, &mut source_root, &entry.meta, &entry.text); self.add_file(
source_root_id,
&source_root_prefix,
&mut source_root,
&entry.meta,
&entry.text,
);
} }
} }
self.set_source_root(source_root_id, Arc::new(source_root.clone())); self.set_source_root(source_root_id, Arc::new(source_root));
(source_root, position) position
} }
fn add_file( fn add_file(
&mut self, &mut self,
source_root_id: SourceRootId, source_root_id: SourceRootId,
source_root_prefix: &str,
source_root: &mut SourceRoot, source_root: &mut SourceRoot,
path: &str, path: &str,
text: &str, text: &str,
) -> FileId { ) -> FileId {
assert!(path.starts_with('/')); assert!(source_root_prefix.starts_with('/'));
let is_crate_root = path == "/lib.rs" || path == "/main.rs"; assert!(source_root_prefix.ends_with('/'));
assert!(path.starts_with(source_root_prefix));
let rel_path = RelativePathBuf::from_path(&path[source_root_prefix.len()..]).unwrap();
let path = RelativePathBuf::from_path(&path[1..]).unwrap(); let is_crate_root = rel_path == "lib.rs" || rel_path == "/main.rs";
let file_id = FileId(self.file_counter);
self.file_counter += 1; let file_id = FileId(self.files.len() as u32);
let prev = self.files.insert(path.to_string(), file_id);
assert!(prev.is_none(), "duplicate files in the text fixture");
let text = Arc::new(text.to_string()); let text = Arc::new(text.to_string());
self.set_file_text(file_id, text); self.set_file_text(file_id, text);
self.set_file_relative_path(file_id, path.clone()); self.set_file_relative_path(file_id, rel_path.clone());
self.set_file_source_root(file_id, source_root_id); self.set_file_source_root(file_id, source_root_id);
source_root.files.insert(path, file_id); source_root.files.insert(rel_path, file_id);
if is_crate_root { if is_crate_root {
let mut crate_graph = CrateGraph::default(); let mut crate_graph = CrateGraph::default();
@ -109,12 +135,13 @@ impl MockDatabase {
fn add_file_with_position( fn add_file_with_position(
&mut self, &mut self,
source_root_id: SourceRootId, source_root_id: SourceRootId,
source_root_prefix: &str,
source_root: &mut SourceRoot, source_root: &mut SourceRoot,
path: &str, path: &str,
text: &str, text: &str,
) -> FilePosition { ) -> FilePosition {
let (offset, text) = extract_offset(text); let (offset, text) = extract_offset(text);
let file_id = self.add_file(source_root_id, source_root, path, &text); let file_id = self.add_file(source_root_id, source_root_prefix, source_root, path, &text);
FilePosition { file_id, offset } FilePosition { file_id, offset }
} }
} }
@ -138,7 +165,7 @@ impl Default for MockDatabase {
events: Default::default(), events: Default::default(),
runtime: salsa::Runtime::default(), runtime: salsa::Runtime::default(),
interner: Default::default(), interner: Default::default(),
file_counter: 0, files: FxHashMap::default(),
}; };
db.set_crate_graph(Default::default()); db.set_crate_graph(Default::default());
db db
@ -151,7 +178,8 @@ impl salsa::ParallelDatabase for MockDatabase {
events: Default::default(), events: Default::default(),
runtime: self.runtime.snapshot(self), runtime: self.runtime.snapshot(self),
interner: Arc::clone(&self.interner), interner: Arc::clone(&self.interner),
file_counter: self.file_counter, // only the root database can be used to get file_id by path.
files: FxHashMap::default(),
}) })
} }
} }

48
crates/ra_hir/src/nameres/tests.rs
View file

@ -1,7 +1,6 @@
use std::sync::Arc; use std::sync::Arc;
use ra_db::{CrateGraph, SourceRootId, SourceDatabase}; use ra_db::{CrateGraph, SourceDatabase};
use relative_path::RelativePath;
use test_utils::{assert_eq_text, covers}; use test_utils::{assert_eq_text, covers};
use crate::{ use crate::{
@ -252,7 +251,7 @@ fn glob_enum() {
#[test] #[test]
fn glob_across_crates() { fn glob_across_crates() {
covers!(glob_across_crates); covers!(glob_across_crates);
let (mut db, sr) = MockDatabase::with_files( let mut db = MockDatabase::with_files(
" "
//- /main.rs //- /main.rs
use test_crate::*; use test_crate::*;
@ -261,8 +260,8 @@ fn glob_across_crates() {
pub struct Baz; pub struct Baz;
", ",
); );
let main_id = sr.files[RelativePath::new("/main.rs")]; let main_id = db.file_id_of("/main.rs");
let lib_id = sr.files[RelativePath::new("/lib.rs")]; let lib_id = db.file_id_of("/lib.rs");
let mut crate_graph = CrateGraph::default(); let mut crate_graph = CrateGraph::default();
let main_crate = crate_graph.add_crate_root(main_id); let main_crate = crate_graph.add_crate_root(main_id);
@ -411,7 +410,7 @@ fn item_map_enum_importing() {
#[test] #[test]
fn item_map_across_crates() { fn item_map_across_crates() {
let (mut db, sr) = MockDatabase::with_files( let mut db = MockDatabase::with_files(
" "
//- /main.rs //- /main.rs
use test_crate::Baz; use test_crate::Baz;
@ -420,8 +419,8 @@ fn item_map_across_crates() {
pub struct Baz; pub struct Baz;
", ",
); );
let main_id = sr.files[RelativePath::new("/main.rs")]; let main_id = db.file_id_of("/main.rs");
let lib_id = sr.files[RelativePath::new("/lib.rs")]; let lib_id = db.file_id_of("/lib.rs");
let mut crate_graph = CrateGraph::default(); let mut crate_graph = CrateGraph::default();
let main_crate = crate_graph.add_crate_root(main_id); let main_crate = crate_graph.add_crate_root(main_id);
@ -445,7 +444,7 @@ fn item_map_across_crates() {
#[test] #[test]
fn extern_crate_rename() { fn extern_crate_rename() {
let (mut db, sr) = MockDatabase::with_files( let mut db = MockDatabase::with_files(
" "
//- /main.rs //- /main.rs
extern crate alloc as alloc_crate; extern crate alloc as alloc_crate;
@ -460,9 +459,9 @@ fn extern_crate_rename() {
struct Arc; struct Arc;
", ",
); );
let main_id = sr.files[RelativePath::new("/main.rs")]; let main_id = db.file_id_of("/main.rs");
let sync_id = sr.files[RelativePath::new("/sync.rs")]; let sync_id = db.file_id_of("/sync.rs");
let lib_id = sr.files[RelativePath::new("/lib.rs")]; let lib_id = db.file_id_of("/lib.rs");
let mut crate_graph = CrateGraph::default(); let mut crate_graph = CrateGraph::default();
let main_crate = crate_graph.add_crate_root(main_id); let main_crate = crate_graph.add_crate_root(main_id);
@ -486,7 +485,7 @@ fn extern_crate_rename() {
#[test] #[test]
fn import_across_source_roots() { fn import_across_source_roots() {
let (mut db, sr) = MockDatabase::with_files( let mut db = MockDatabase::with_files(
" "
//- /lib.rs //- /lib.rs
pub mod a { pub mod a {
@ -494,22 +493,15 @@ fn import_across_source_roots() {
pub struct C; pub struct C;
} }
} }
",
);
let lib_id = sr.files[RelativePath::new("/lib.rs")];
let source_root = SourceRootId(1); //- root /test_crate/
let (sr2, pos) = db.add_fixture( //- /test_crate/main.rs
source_root,
"
//- /main.rs
use test_crate::a::b::C; use test_crate::a::b::C;
", ",
); );
assert!(pos.is_none()); let lib_id = db.file_id_of("/lib.rs");
let main_id = db.file_id_of("/test_crate/main.rs");
let main_id = sr2.files[RelativePath::new("/main.rs")];
let mut crate_graph = CrateGraph::default(); let mut crate_graph = CrateGraph::default();
let main_crate = crate_graph.add_crate_root(main_id); let main_crate = crate_graph.add_crate_root(main_id);
@ -533,7 +525,7 @@ fn import_across_source_roots() {
#[test] #[test]
fn reexport_across_crates() { fn reexport_across_crates() {
let (mut db, sr) = MockDatabase::with_files( let mut db = MockDatabase::with_files(
" "
//- /main.rs //- /main.rs
use test_crate::Baz; use test_crate::Baz;
@ -547,8 +539,8 @@ fn reexport_across_crates() {
pub struct Baz; pub struct Baz;
", ",
); );
let main_id = sr.files[RelativePath::new("/main.rs")]; let main_id = db.file_id_of("/main.rs");
let lib_id = sr.files[RelativePath::new("/lib.rs")]; let lib_id = db.file_id_of("/lib.rs");
let mut crate_graph = CrateGraph::default(); let mut crate_graph = CrateGraph::default();
let main_crate = crate_graph.add_crate_root(main_id); let main_crate = crate_graph.add_crate_root(main_id);