From 3ac605e6876056fa56098231cc2f96553faab8f0 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Thu, 20 Dec 2018 21:56:28 +0100 Subject: Add beginnings of type infrastructure --- crates/ra_hir/src/mock.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crates/ra_hir/src/mock.rs') diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs index 9423e6571..a9fa540d5 100644 --- a/crates/ra_hir/src/mock.rs +++ b/crates/ra_hir/src/mock.rs @@ -8,7 +8,7 @@ use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset}; use crate::{db, DefId, DefLoc}; -const WORKSPACE: SourceRootId = SourceRootId(0); +pub const WORKSPACE: SourceRootId = SourceRootId(0); #[derive(Debug)] pub(crate) struct MockDatabase { @@ -182,6 +182,7 @@ salsa::database_storage! { fn item_map() for db::ItemMapQuery; fn fn_syntax() for db::FnSyntaxQuery; fn submodules() for db::SubmodulesQuery; + fn infer() for db::InferQuery; } } } -- cgit v1.2.3 From 7348f7883fa2bd571fff036c82e98c102d05c362 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 23 Dec 2018 12:05:54 +0100 Subject: Add testing infrastructure for type inference - move dir_tests to test_utils for that. --- crates/ra_hir/src/mock.rs | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'crates/ra_hir/src/mock.rs') diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs index a9fa540d5..3020ee793 100644 --- a/crates/ra_hir/src/mock.rs +++ b/crates/ra_hir/src/mock.rs @@ -24,6 +24,15 @@ impl MockDatabase { (db, source_root) } + pub(crate) fn with_single_file(text: &str) -> (MockDatabase, SourceRoot, FileId) { + let mut db = MockDatabase::default(); + let mut source_root = SourceRoot::default(); + let file_id = db.add_file(&mut source_root, "/main.rs", text); + db.query_mut(ra_db::SourceRootQuery) + .set(WORKSPACE, Arc::new(source_root.clone())); + (db, source_root, file_id) + } + pub(crate) fn with_position(fixture: &str) -> (MockDatabase, FilePosition) { let (db, _, position) = MockDatabase::from_fixture(fixture); let position = position.expect("expected a marker ( <|> )"); -- cgit v1.2.3 From ef67581104eb00a0c199f0b2a3b558da8a6f90a2 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 23 Dec 2018 17:13:11 +0100 Subject: Resolve paths to defs (functions currently) during type inference --- crates/ra_hir/src/mock.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'crates/ra_hir/src/mock.rs') diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs index 3020ee793..b5a997170 100644 --- a/crates/ra_hir/src/mock.rs +++ b/crates/ra_hir/src/mock.rs @@ -192,6 +192,7 @@ salsa::database_storage! { fn fn_syntax() for db::FnSyntaxQuery; fn submodules() for db::SubmodulesQuery; fn infer() for db::InferQuery; + fn type_for_def() for db::TypeForDefQuery; } } } -- cgit v1.2.3